fixed all forms! any models with an association CAN NOT USE A SIMPLE FORM OR A FORM THAT REFERENCES AN OBJECT!!!
NO! NO! NO!
Merge branch 'master' of https://github.com/LBayer/ECSLCS-GroupC

Conflicts:
	app/controllers/user_roles_controller.rb
	app/models/ability.rb
	app/views/user_roles/_form.html.erb