just changing comments to use my real name
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/org/owasp/jaws/bad/DatabaseTestCase.java
	src/test/java/org/owasp/jaws/good/DatabaseTestCase.java