resolve sample_data
resolve rspec problems
Merge branch 'master' of https://github.com/cosimo-dw/NamingSaaS