Merge pull request #282 from BU-CS673/Canfield

Canfield -> Canfield-Staging
Merge pull request #292 from BU-CS673/production

Update Brandon with Production Latest
Merge pull request #293 from BU-CS673/master

master -> Canfield
Fixed Parser eating exceptions, & returning invalid map
Tests were catching the wrong ParseException (wrong package)

Tests were catching java.text.ParseException rather than
org.json.simple.parser.ParseException. java.text.ParseExceptions are
never thrown by the parser.
Merge pull request #294 from BU-CS673/Canfield

Canfield -> Canfield-Staging
Fixed incorrect millisecond calc in integration tests

Except for Sprint 2 integration test, since we'll need to discuss that.
Commented out tick limitter until we can research it more

- Using it causes the game to become jittery
- Also corrected a likely overflow issue
Merge pull request #296 from BU-CS673/Canfield

Canfield -> Canfield-Staging
Fixed black line alignment issue w/ certain textures
Merge pull request #297 from BU-CS673/Canfield

Fixed black line alignment issue w/ certain textures
Merge pull request #295 from BU-CS673/Canfield-Staging

Canfield-Staging -> production
Merge pull request #299 from BU-CS673/production

Production
Added Map Building Tilesets

Added the two tileset files to the tools folder for building maps in
Tiled.
Merge pull request #300 from BU-CS673/Brandon

Added Tileset Files
Implemented local collision checks

* Methods in TileUtil return a list of entities that are likely to
collide/overlap with a given position or Tile Location
* Added lists of actors and effects to the GameWorld class, added in
addEntity
Added unit tests.
Fixed bugs

* removed mapTiles[][] initialization in GameWorld constructor -- should
be null unless the parser is used or the tiles are set manually. This
was causing the errors in TileUtil.
* Changed unit tests for TileUtil to use both overloaded and
non-overloaded methods.
* Added getClosestTileX/Y to TileUtil.
Removed print statement
Merge pull request #303 from BU-CS673/Aaron

Implemented local collision checks for Tank