Merge remote-tracking branch 'upstream/master'
UCBG-174: code to support Collection Holdings Report. And a couple other small tweaks
NOJIRA: code cleanup, getting rid of comments, etc.
Merge remote-tracking branch 'upstream/master' into tempbranch

Conflicts:
	webapps/py/cswaMain.py
	webapps/py/cswaUtils.py
Merge pull request #11 from jblowe/master

UCBG-174: botgarden Collection Holdings Report, other minor code cleanup