feature2
Merge branch 'develop' of github.com:florin-onac/Hello into develop

Conflicts:
	App/App.csproj