Profile
Merge remote-tracking branch 'origin/Feature/NewUI' into Feature/NewUI

Conflicts:
	app/views/staff/dashboard.blade.php