Fix Main
Merge branch 'development'

Conflicts:
core/src/pheonixTeam/main/Main.java
Merge branch 'master' into development

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