25336 Role dashboard settings - widgets
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/application/views/admin/menu.php