Merge origin/master

Conflicts:
	.gitignore
	JavaFX/build.xml
	JavaFX/nbproject/build-impl.xml
	JavaFX/nbproject/genfiles.properties
	JavaFX/nbproject/project.properties
	JavaFX/nbproject/project.xml
	JavaFX/src/javafx/JavaFX.java
Merge origin/master

Conflicts:
	.gitignore
	JavaFX/build.xml
	JavaFX/nbproject/build-impl.xml
	JavaFX/nbproject/genfiles.properties
	JavaFX/nbproject/project.properties
	JavaFX/nbproject/project.xml
	JavaFX/src/javafx/JavaFX.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
xxx
xxx