Point of interest
Point of interest
Point of interest
Merge origin/master

Conflicts:
	www/scripts/services/dummydata.js
Point of interest OK
Point of interest OK