Merge branch 'master' of https://github.com/danecek/mvn-osgi-library-2014

Conflicts:
	.gitignore
	integration/src/main/java/org/lib/integration/AbstractDAOFactory.java
	richclient/src/main/java/org/lib/richclient/AddBookDialog.java
	richclient/src/main/java/org/lib/richclient/BookPanel.java
Merge branch 'master' of https://github.com/danecek/mvn-osgi-library-2014

Conflicts:
	.gitignore
	integration/src/main/java/org/lib/integration/AbstractDAOFactory.java
	richclient/src/main/java/org/lib/richclient/AddBookDialog.java
	richclient/src/main/java/org/lib/richclient/BookPanel.java
Merge branch 'master' of https://github.com/danecek/mvn-osgi-library-2014

Conflicts:
	.gitignore
	integration/src/main/java/org/lib/integration/AbstractDAOFactory.java
	richclient/src/main/java/org/lib/richclient/AddBookDialog.java
	richclient/src/main/java/org/lib/richclient/BookPanel.java