user & auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/admin/views/layouts/index.php