login merge
Merge branch 'master' of https://github.com/Archerwind/MoneyFirm

Conflicts:
	login.php