Merge branch 'dev'
Improve devise helper
Add application.yml example