Only allow importer/exporter to use .json files
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Fix NullPointerException exceptions on empty game description
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Fix PPG description tests
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge github.com:benkorza/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Fix a minor Average fill-in value in ClosedGameView

Reported-by: hlong290494
Signed-off by: Long Nguyen DUc Hoang <lhnguyenduc@wpi.edu>
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Fixed FinalEstimateView to scale

Changed some GUI code to allow for scaling of FinalEstimateView
Fixes errors in DeckEntityManagerTest
with rbkillea
Change text back to submit

It stayed at submitted once one was submitted
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge pull request #424 from benkorza/sbl-dev

Stops the overview tree from throwing exceptions when file structures are highlighted