Merge branch 'Toby' of github.com:SvH/TravelSquare into sven
All
Merge branch 'master' of github.com:SvH/TravelSquare into sven

Conflicts:
	app/controllers/foursquare.js
	public/tours.json
Merge branch 'sven' of github.com:SvH/TravelSquare