bad login fixed.
Merge branch 'April-Promos'
Merge branch 'master' of https://github.com/16twenty/contact