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

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

Conflicts:
	workspace/book/model/target/classes/fr/umlv/book/model/beans/bookelement/Book.class
Merge branch 'master' of https://github.com/nimajen/Book