random commit
resolve conflict

Conflicts:
	js/views/mapPage.js
modifiy map infowindow