Merge branch 'release/unicorn_release' into staging
Fixed broken user spec tests
Fixed broken tests
Merge branch 'feature/ui_pass'