cập nhật model, migration
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/config/app.php
	app/config/database.php
	app/config/local/database.php
	app/models/User.php
	app/routes.php
	app/tests/TestCase.php
	composer.json
	nbproject/private/private.properties