update view model service is now wotking
Merge branch 'master' of https://github.com/cojalvo/CampusInProject

Conflicts:
	GoogleMapProject/res/layout/event_info_popup.xml