added dashboard , changed routing
Merge remote-tracking branch 'origin/dev'

Conflicts:
	protected/config/main.php