Integrated codebase

Facebook, Yourmapper and Yelp merged endpoints with augmented div
display
Merge branch 'master' of https://github.com/adas41/mARs

Conflicts:
	service/fbCheckin.js
	service/yelpSearch.js