Minor changes
Merge branch 'master' into scene2d

Conflicts:
	core/model/src/main/java/ead/common/model/elements/huds/MouseHud.java
Go on...