Merge branch 'development'
Fix one piece of code
Merge branch 'development'
Merge branch 'master' into development

Conflicts:
	core/src/pheonixTeam/main/Main.java