back to bootstrap 2, views
Merge branch 'master' of github.com:SvH/TravelSquare into sven
Add tours MVC including maps
Merge branch 'master' of github.com:SvH/TravelSquare into sven
changes blacklist
Merge branch 'Claudio' of github.com:SvH/TravelSquare
deleted newrelic log
Merge branch 'Toby' of github.com:SvH/TravelSquare
Merge branch 'sven' of github.com:SvH/TravelSquare