Add annotation test example
Merge branch 'step-1' into step-2

Conflicts:
	src/test/java/gov/nih/tbi/account/service/complex/AccountManagerImplTest.java
Merge branch 'step-2' into step-3

Conflicts:
	src/test/java/gov/nih/tbi/account/service/complex/AccountManagerImplTest.java
Merge branch 'step-3' into step-4

Conflicts:
	src/test/java/gov/nih/tbi/account/service/complex/AccountManagerImplTest.java
Merge branch 'step-4' into step-5
Merge branch 'step-5' into step-6
Merge branch 'step-6' into step-7
Merge branch 'step-7' into step-8
Fix merge error
Merge branch 'step-8' into step-9
Merge branch 'step-9' into step-10
Merge branch 'step-10'