Adapted further to YiiBooster style (yii-user)
Adapted further to YiiBooster style (yii-user)
Fix span space bug
Merge branch 'custom-changes' into merge

Conflicts:
	messages/de/user.php
Merge branch 'support-for-yii-booster' into merge