Merge branch 'master' into lsl

# Conflicts:
#	src/gitTest/Test.java

src/gitTest/Test.java

@@ -20,6 +20,8 @@ public class Test {
     	System.out.println("Test_rebase");
     }
     
+
+    
     public static void  Test_rebase2(){
     	System.out.println("Test_rebase2");
     }