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

Conflicts:
	ASQL4/ASQL4.ssms_suo
	ASQL4/ASQL4/ASQL4.ssmssqlproj