merged with upstream/develop
changes to the medel and specs
updates in users_helper_spec after upstream merge
-qwMerge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into events
rspec all GREEN