Moved the BattleClass from Hero to BattleCharacter
Added a level field to BattleCharacter to keep track of leveling
Updated the leveling system a bit
BattleCharacter mana and health are now maintained as fractions on the interval [0,1], where 0 is none and 1 is full.  All references to health and mana externally however reference the actual numerical value (ie fractionMana * maxMana), with the exception of the constructor
Created and added Parsers for BattleCharacter, Party, and Subclasses
Unlike other subclass Parser interactions, the Party classes are so similar that the core code is referenced in the Party.Parser, and the subparsers are only used for creating the actual instances.
Created an EnumParser as an internal class of SuperParser.  Direction and BattleClass now use EnumParsers rather than unique Parsers
Created helper methods addFloat and getFloat in SuperParser as they became necessary
Added a getSpellList to BattleCharacter
Merge branches 'battle' and 'master' of https://github.com/math1man/SuperMacalester into battle
Merge branches 'battle' and 'master' of https://github.com/math1man/SuperMacalester into battle
Created DialogueWindow class to handle actual rendering of dialogue
DialogueHandler will need more versatility to take advantage of variable DialogueWindows
Thoroughly reworked the Battle.getActions sequence to be a bit less dense
Likewise, added some functions to Party and subclasses
Font is now scaled automatically in the AssetLoader
Made lists returned by Inventory unmodifiable
Other small mostly aesthetic tweaks
Almost have the new Dialogue system testable
Added a Parser for Spells, and a cache identical to the item cache
Added some items referenced in the plot to the items.txt data file
Added information regarding a lot of things to the parser_info.txt file
Added DialogueStyle, which changes where dialogue is displayed on screen
Added a Style field to DialogueHandler, which it uses to display the dialogue
Updated the DialogueStyles to be more descriptive
Added an origin parameter to the entities.txt file
merged from dev, and other changes
Updated dialogues.txt
Added entities to entities.txt
Added items to items.txt
Updated parser_info.txt
Fixed options parsing incorrectly
Removed bitmasks from items (at least for now)
Added a clear method to GameMap for clearing entities
Added parsers for Asteroid and GarbageCan
Added an Origin setting for parsing World JSONs, so that if the map ever increases dimension, we simply need to modify the origin
Hero implements InteractionBuilder: the interaction adds the hero to the main party
Added a MainParty instance to the MainMapCharacter, this is the main party
Set up the main party in the GameScreen from above
Cursory setup for Battle testing via BattleTest
Also need to implement DialogueWindow.toString()
Added Effect and EffectParser, which handle how the effects of items and spells are processed and used in battle.
Merge branch 'battle' of https://github.com/math1man/SuperMacalester into battle
Overwrote the update method in BattleTest in order to bypass the DialogueHandler
Updated the framework for Test Battles
dumb stuff
dumb stuff
Merge remote-tracking branch 'origin/battle' into battle

Conflicts:
	SuperMacalester.iml
merged with master