Test merge from Eclipse
Testing conflicting merge

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

Conflicts:
	src/java/nextgen/core/model/AlignmentModel.java