applied hot fix 1
Merge branch 'master' into dev

Conflicts:
	SS.App/Program.cs
cleanup from merge