Merge branch 'master' into 'dev/20181128_001'

# Conflicts:
#   Test/src/Test.java

Test/src/Test.java

@@ -3,7 +3,7 @@ public class Test {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
-		System.out.println("TEST branch ");
+		System.out.println("TEST ....  ");
 	}
 
 }