refact
Merge remote-tracking branch 'origin/master'

Conflicts:
	front/adminpanel/src/main/java/com/indexisto/front/adminpanel/shared/RPCSErrorCodes.java