Test comment
Merge branch 'master' of https://github.com/mgarber/scriptureV2.git

Conflicts:
	src/java/nextgen/core/tests/TestAnnotations.java
Resolved test conflict