template controller
test
Merge remote-tracking branch 'remotes/origin/kont2' into develop

Conflicts:
	TestGenerator/TestGenerator.UnitTests/TestGenerator.UnitTests.csproj
	TestGenerator/TestGenerator.UnitTests/packages.config
	TestGenerator/TestGenerator.WebUI/Controllers/AccountController.cs
	TestGenerator/TestGenerator.WebUI/Controllers/TestController.cs
	TestGenerator/TestGenerator.WebUI/TestGenerator.WebUI.csproj
cleanup