moved search form to nav bar
Merge branch 'master' of https://github.com/alexung/hotspot into basic_views
Merge pull request #51 from alexung/basic_views

Basic views