solution

solution
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeveloperGames.v12.suo