no message
Merge branch 'develop' of https://github.com/ajency/Browntape into Login

Conflicts:
	browntape/www/views/error.html
Completed login view