devise
Merge branch 'master' of https://github.com/Sidnah/happ into dev
Merge branch 'dev' of https://github.com/Sidnah/happ into dev