Task Admin, User
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php
	public/assets/css/style.css