Log::error implemented.
Merge branch 'master' of https://github.com/XDocker/app

Conflicts:
	app/controllers/user/UserController.php