Merge branch 'unify-stage'
Merge to stage branch
Merge branch 'master' of https://github.com/sakutumb/unify

Conflicts:
	app/assets/javascripts/partials/bureau/registration.html
	app/assets/javascripts/partials/hero.html
Merge branch 'master' of https://github.com/sakutumb/unify