Back Office
Merge branch 'master' of github.com:seb/bootstrap-app

Conflicts:
	app/assets/javascripts/application.js.coffee
	app/assets/stylesheets/application.css.scss
	config/environments/development.rb
	config/routes.rb