delete account link; repair of redirect to set password
Merge branch 'master' of https://github.com/mediahost/sc

Conflicts:
	app/module/AdminModule/templates/UserSettings/settings.latte