Merge branch 'unify-stage'
layout fixes
layout fixes for login, registration
layout fixes for login, registration
layout fixes for login, registration
Merge branch 'master' into unify-stage
Merge branch 'unify-stage'
Merge to stage branch
layout fixes for login, registration
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
Merge branch 'master' into unify-stage

Conflicts:
	app/assets/javascripts/partials/bureau/registration.html
	app/assets/javascripts/partials/hero.html