Yeoman scaffold
Merge branch 'feature/booking-show' into develop

Conflicts:
	app/index.html
	app/scripts/app.coffee