.
Merge branch 'master' of github.com:apetrovskiy/STUPS

Conflicts:
	TMX/Tmx.Server/Modules/TestTasksModule.cs
refactoring and decoupling in Tmx