update database
update phan login ho Viet
Merge branch 'master' of https://github.com/hoangdd/7maru

Conflicts:
	app/Model/User.php
	tables.sql