Sua vo van
Merge branch 'master' of https://github.com/quan32/ITJ
Merge branch 'master' of https://github.com/quan32/ITJ
Merge branch 'master' of https://github.com/quan32/ITJ
Lay code cua cuong ve
Sua conflict

Conflicts:
	app/Controller/ManagesController.php
Merge branch 'master' of https://github.com/quan32/ITJ
Hoan thanh thay doi thoi gian tu dong log
Merge branch 'master' of https://github.com/quan32/ITJ