Merge origin/master
did some thing
Merge origin/master

Conflicts:
	src/pathfinder/data/Character/Character.java
Externalised some of the Javafx framework, now requires https://github.com/HIMISOCOOL/JefXif
Data has been moved to JefXif