g
Merge branch 'static-pages' into dev
Added more right spec test for static pages
Users controller added
Conflict resolved
Routes and gemfile changed
test
test2