MERGED:
MERGED: trunk
test
dummy
ADDED: /branches/feature/test
small refactorings
resharper cleanup code