Merge remote-tracking branch 'origin/master' into sita

Conflicts:
	src/edu/asu/laits/gui/Application.java
	src/edu/asu/laits/model/GraphLoader.java
Added more Activity Logs
Export Solution Bug fix
Merge remote-tracking branch 'origin/bvds' into sita

Conflicts:
	src/edu/asu/laits/gui/Application.java
	src/edu/asu/laits/model/GraphLoader.java
	src/edu/asu/laits/model/LaitsSolutionExporter.java
add forum documentation
Update forum.md
Update forum.md
Bug fixes
Merge origin/sita
URL Encoder fix
Merge remote-tracking branch 'origin/master' into sita
URL Encoder fix
Merge remote-tracking branch 'origin/bvds2'

Conflicts:
	documentation/forum.md
	src/edu/asu/laits/gui/Application.java
	src/edu/asu/laits/gui/menus/ModelMenu.java
	src/edu/asu/laits/model/LaitsSolutionExporter.java
	src/edu/asu/laits/model/PersistenceManager.java
Restored missing getQuery method in PersistenceManager
Merge from branch bvds2.  This merge takes all *.java files
from branch bvds2.  This undoes some commits:
   commit 22344b0c6e24138f951daa
   commit 4f82f75d2928c46fe79f (this wouldn't even build)
   commit 73db586b3265bbdb1  (this introduced numerous bugs)
   commit 01c91c7a092efaa58fc8 (this introduced numerous bugs)
Merge branch 'bvds2'

Conflicts:
	src/edu/asu/laits/model/LaitsSolutionExporter.java
add standard variable names to documentaiton
Completed .xsd file; updated documentation and XML sample file.
Merge branch 'master' of https://github.com/rptiwari/LaitsV3
XML validation script
Fixed error in loading sessions from XML problems in non-author mode