fix bug when user has no ordergroup, and do not require approval for admins
Merge branch 'selfsignup' into onlinepay

Conflicts:
	app/controllers/application_controller.rb