in progress
Merge remote-tracking branch 'origin/feature/lite' into feature/lite

Conflicts:
	server-alt/src/main/java/com/devicehive/server/persistence/MessagePE.java