Fix to login bug
Merge branch 'master' of https://github.com/derekscruggs/avenir

Conflicts:
	app/controllers/mobile_controller.rb