Merge branch 'development'

Conflicts:
	src/main/java/org/daisy/pipeline/gui/Activator.java
	src/main/java/org/daisy/pipeline/gui/MainWindow.java
	src/main/resources/OSGI-INF/gui.xml