add CandidateCategory class
non-null those ID columns
Merge branch 'master' of github.com:ashleygwilliams/policycompass
whoops, don't delete the Org model bro
Merge branch 'master' of github.com:ashleygwilliams/policycompass

Conflicts:
	app/models/org.rb