wrote some new acceptance tests for the User profile interface
user controller tests
fixed merge conflict - user controller specs
removed duplicate store factory