a
Merge branch 'master' of https://github.com/xiaovn/mms
Merge branch 'master' of https://github.com/xiaovn/mms
login
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.php
Fix create account and login