xpath syntax updated to past PHP 5.3
Merge branch 'master' of https://github.com/OSMBuildings/Portal

Conflicts:
	html_jquery/server/Service.php