3rd commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/umass/ckc/wo/wpa/db/ProblemMgr.java