images
Merge remote-tracking branch 'origin/master'

Conflicts:
	App1/App1/App1.csproj