Merge origin/master
changes in admin_dashboard.php for Panels
Merge origin/master

Conflicts:
	views/admin/admin_dashboard.php