finishing merge

Conflicts:
	Foursquare/app/assistants/main-assistant.js
	Foursquare/app/lib/globals.js
	Foursquare/appinfo.json