Merge branch 'selfsignup' into onlinepay

Conflicts:
	app/controllers/application_controller.rb