Working on Characters
Reworked setRace(String)
Working on Characters
mod to fix movement bug
Working on Conjured Units
added @override
fixed some hexes in the mainmap.xml file where certain hexes had
flags setting them as vortexes.
working on conjured units
Merge origin/master
fixed another xml bug - finding them with mapdemo.java
Merge branch 'master' of https://github.com/cjeffery/sworsorc
Added teleport to UnitPool.  still needs tests written.
Changed the way Game loads JavaFX files.

Game now uses an FXMLoader instance to load the HUD. By using
an instance rather than the static FXMLoader methods, we can
get a reference to the actual hudController instance used
to update the hud.

We're storing this reference so that the network Conductor object
can initiate changes to the GUI when certain network events occur.
Merge origin/master
worked on mouse functionality with map
Merge branch 'master' of https://github.com/cjeffery/sworsorc

Conflicts:
	src/client/mainswordsorcery/HUDController.java
more spell future design code
made a change and undid it
nothing different