make redundant
Merge branch 'master' into payment-code-fuckup

Conflicts:
	app/models/registration.rb
	db/schema.rb
I love you, Felix <3
fix basic registration and add test
Merge branch 'payment-code-fuckup' into payment-code-fuckup-views
Paper trail save correct column
Why the fuck are the filters broken
Merge branch 'master' into payment-code-fuckup

Conflicts:
	test/controllers/registrations_controller_test.rb
Merge branch 'payment-code-fuckup' into payment-code-fuckup-views

Conflicts:
	app/grids/registrations_grid.rb
Fix the filters
Merge pull request #411 from ZeusWPI/payment-code-fuckup-views

I love you, Felix <3
whiiiii
move all to model
less clear return values
Merge pull request #410 from ZeusWPI/payment-code-fuckup

make redundant

(Fixes #409)