add separate character
Merge remote-tracking branch 'origin/baseadmin_theme' into baseadmin_theme

Conflicts:
	protected/views/data/index.php