Only allow importer/exporter to use .json files
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 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 github.com:struct-by-lightning/wpi-suite into sbl-dev
Stops the overview tree from throwing exceptions when a file structure is highlighted
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
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
Fix the bug that puts "?" in a voted game in OpenGameView.

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 pull request #426 from sfmailand/sbl-dev

Change text back to submit
Merge pull request #425 from ZPak/sbl-dev

Fixed FinalEstimateView to scale
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev