Merge branch 'dev' into flirt4free

CHANGELOG.md

@@ -9,7 +9,7 @@
 * Added filter for recorded models
 * Added mechanism to ignore models. Ignored models will not show up in the
   thumbnail overviews anymore. This might be useful, if you like to browse for 
-  new models to record, and don't want hide models you don't like, so that they
+  new models to record, and want to hide models you don't like, so that they
   don't show up again in the future
 * Multi-selection in the thumbnail overview with ctrl instead of shift
  

client/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>1.19.1</version>
+		<version>1.20.0</version>
 		<relativePath>../master</relativePath>
 	</parent>
 

common/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>1.19.1</version>
+		<version>1.20.0</version>
 		<relativePath>../master</relativePath>
 	</parent>
 

master/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>ctbrec</groupId>
 	<artifactId>master</artifactId>
     <packaging>pom</packaging>
-	<version>1.19.1</version>
+	<version>1.20.0</version>
 	
 	<modules>
 		<module>../common</module>

server/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>1.19.1</version>
+		<version>1.20.0</version>
 		<relativePath>../master</relativePath>
 	</parent>