update dashboard user
Merge branch 'development' of https://github.com/vanbungkring/turbo-lana into development
update dashboard user
Merge branch 'development' of https://github.com/vanbungkring/turbo-lana into development

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