simplify user form templates
Merge branch 'selfsignup' into onlinepay
Merge branch 'onlinepay' into foodcoop-adam-new

Conflicts:
	app/views/shared/_user_form_fields.html.haml
always create ordergroup with user