Merge origin/master

Conflicts:
	src/java/it/mam/REST/controller/front/MyProfileEdit.java
	src/java/it/mam/REST/controller/front/SeriesCard.java