DB
register
Merge branch 'master' of https://github.com/vietanh-it/19-poker

Conflicts:
	app/controllers/AdminTournamentController.php
	app/libraries/Api.php
	app/routes.php
	app/views/admin/tournament/add_view.blade.php
	app/views/admin/tournament/list_view.blade.php
	app/views/layout/administrator.blade.php
	composer.json
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php