Added XLocation plugin
Merge branch 'StefanLage-master'

Conflicts:
	packages.json