Merge origin/master

Conflicts:
	src/java/it/mam/REST/utility/RESTSortLayer.java
Merge origin/master