the AddressBookDAO class is now a singleton
Merge remote-tracking branch 'origin/master' into iris-base-j7

Conflicts:
	iris-core/pom.xml