//
Merge remote-tracking branch 'origin/master'

Conflicts:
	proj.win32/iCasino_v2.suo