fixed some rspec controllers

added factories for other models

added factories for other models

fixed all of the resource_controllers spec
Merge branches 'master' and 'reb'