Fixed error in exporting where + operands were vanishing
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