API done
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	app/controllers/admin/UsersController.php
	app/routes.php
	app/storage/logs/laravel.log
API done