Merged with master
Merge branch 'master' of https://github.com/richseviora/bitmaker-seatyourself

Conflicts:
	app/views/customer/customers/show.html.erb
Merge branch 'master' of https://github.com/richseviora/bitmaker-seatyourself