add info window for markers
add info window for markers
Merge branch 'master' of github.com:eecsninja/partyview

Conflicts:
	app/src/main/res/values/strings.xml