Bug fixes
Merge branch 'master' of https://github.com/Quins/megafon-sapsan

Conflicts:
	public/wrong-password.ejs