admin role
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/autoload/global.php