Merge branch 'master' into boss_ginger
Merge branch 'master' into boss_ginger
new features
Merge branch 'boss_ginger'
Merge branch 'iuriy'

Conflicts:
	reservation.html
	seatmap_business.html
	seatmap_coach.html
	seatmap_first.html
Merge branch 'master' into iuriy