updated reservation controller and search view
merge with master
Merge branch 'master' into mike
Merge pull request #73 from spotfinder/mike

Merging Mike