Merge pull request #70 from scalableinternetservices/anders

Anders
some modal work in locations
Merge branch 'master' of https://github.com/scalableinternetservices/BaconWindshield into anders