Merge origin/master
Merge origin/master

Conflicts:
	www/partials/pointofinterest.html
	www/scripts/controllers/pointofinterest.js