initial dab at this soap api thing
Merge branch 'master' into soap-api
that would be so cool if that would work
Improve migration, remove some export-code from model
Merge branch 'soap-api' of github.com:ZeusWPI/FK-enrolment into soap-api

* 'soap-api' of github.com:ZeusWPI/FK-enrolment:
  that would be so cool if that would work

Conflicts:
	app/models/member.rb
Remove more ISIC stuff, fix tests
Update state when exporting cards
Add HTML & CSS for address fields
API works
Split out reports and exports
Add option to force mailing cards
Improve layout and errors of general form page
Better error combining on postalcode/city
Merge branch 'soap-api'

* soap-api:
  Better error combining on postalcode/city
  Improve layout and errors of general form page
  Add option to force mailing cards
  Split out reports and exports
  API works
  Add HTML & CSS for address fields
  Update state when exporting cards
  Remove more ISIC stuff, fix tests
  Improve migration, remove some export-code from model
  that would be so cool if that would work
  initial dab at this soap api thing