Annotate

Cherry-pick of 7ff877f94a031131f017b2e8b5d97a71dffd8fbf

Conflicts (deleted all):
	app/models/role.rb
	test/fixtures/roles.yml
	test/unit/role_test.rb
Rolify gem
Switched to 1.8.7-compat rolify
Rolifoied the user
Added some roles
Fixed PK on Organizer