add icons to infoWindow and marker-panel
Merge branch 'master' of https://github.com/stevenvandervalk/Defibrillator_Locator

Conflicts:
	.idea/workspace.xml