merge
Merge branch 'dev' of https://github.com/sguergachi/AuroraEngine into dev

Conflicts:
	src/aurora/engine/V1/UI/AMarqueePanel.java