user profile design
Merge branch 'master' of https://github.com/mediahost/sc

Conflicts:
	app/module/AdminModule/presenters/UserSettingsPresenter.php