images
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-app/images/markers/map_marker_photo_32.png