Merge pull request #282 from BU-CS673/Canfield

Canfield -> Canfield-Staging
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