fix
Merge remote-tracking branch 'origin/master'
fix2
Merge remote-tracking branch 'origin/master'

Conflicts:
	front/adminpanel/src/main/java/com/indexisto/front/adminpanel/server/rpc/IndexesRPCServiceImpl.java