Bug Fix 2271 - cherry-picked from sita d95e01a8

Conflicts:
	src/edu/asu/laits/gui/ExportSolutionPanel.java
Bug Fix 2266 - cherrypicked from sita d6e21565

Conflicts:
	src/edu/asu/laits/model/PersistenceManager.java
light bugfixes
Merge branch 'master' of https://github.com/rptiwari/LaitsV3