.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Site Hotel/Site Hotel.v11.suo