adding a Admin controller
Merge branch 'master' of https://github.com/spotfinder/spotfinder
changing label names
Merge pull request #70 from spotfinder/karina

changing label names
Merge pull request #71 from spotfinder/mike

current update
updated reservation controller and search view