blank dashboard
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	protected/views/front/site/user-dashboard.php