Merge origin/master

Conflicts:
	entity/GeolocalistionEntity.php
Merge origin/master