Cleared solution
Merge branch 'develop' of https://github.com/tbondar-softheme/test-proj into develop

Conflicts:
	.gitignore