Merge branch 'master' of https://github.com/bobolinks-2014/browsin into frontend

merged master.
user fixes
updates to user profile
fixed the show-hide problem in users
Merge pull request #58 from bobolinks-2014/frontend

Frontend
updated specs
Merge pull request #59 from bobolinks-2014/controller-spec

updated specs
Testing for multiple query types
Fixed merge conflicts
Merge pull request #60 from bobolinks-2014/search_controller_spec

Testing for multiple query types
updated user model spec
added user preference model spec
Merge pull request #62 from bobolinks-2014/model-spec

model specs
updated rspec syntax
refactored features specs
added more css
Merge pull request #63 from bobolinks-2014/controller-spec

updated rspec syntax
fixed typo
Merge pull request #64 from bobolinks-2014/specs

refactored features specs
user profile is done and fully functional