small changes
Merge branch 'master' of https://github.com/bwalker99/Sandbox

Conflicts:
	BBClassList/WebContent/_BBClassList-build.jspf

small change