Pre-merge
Merge remote-tracking branch 'gh-r-gayming/master'

Conflicts:
	karax/src/fr/neyrick/karax/entities/generic/CharacterEdit.java
	karax/src/fr/neyrick/karax/model/eclipsephase/EclipsePhaseCharacterFactory.java