commit
Merge branch 'master' of https://github.com/nimajen/Book

Signed-off-by: Roy Benjamin <nimajen@gmail.com>

Conflicts:
	workspace/book/model/pom.xml
	workspace/book/model/src/main/java/fr/umlv/book/model/dao/impl/OrganizationDAO.java
	workspace/book/model/src/main/java/fr/umlv/book/model/dao/impl/UserDAO.java
	workspace/book/model/src/main/java/fr/umlv/book/model/dao/impl/WorkPackageDAO.java
	workspace/book/model/src/main/java/fr/umlv/book/model/dao/impl/WorkSpaceDAO.java
	workspace/book/model/src/test/java/fr/umlv/book/model/dao/TestChapterDAO.java
	workspace/book/model/src/test/java/fr/umlv/book/model/dao/TestParagraphDAO.java
	workspace/book/model/src/test/java/fr/umlv/book/model/dao/TestVolumeDAO.java
	workspace/book/model/target/classes/META-INF/maven/fr.umlv.book/model/pom.xml
	workspace/superpom/pom.xml