Merge origin/master

Conflicts:
	src/java/it/mam/REST/controller/front/SeriesList.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/it/mam/REST/controller/front/SeriesList.java