Merge branch 2.4

diff --cc CMakeLists.txt
Simple merge

diff --cc doc/tutorials/highgui/video-input-psnr-ssim/video-input-psnr-ssim.rst
Simple merge

diff --cc modules/core/doc/operations_on_arrays.rst
Simple merge

diff --cc modules/flann/doc/flann_fast_approximate_nearest_neighbor_search.rst
Simple merge

diff --cc modules/java/android_test/src/org/opencv/test/features2d/FASTFeatureDetectorTest.java
Simple merge

diff --cc modules/java/java_test/build.xml
index 0000000,49d2bf1..5843f74
mode 000000,100644..100644
--- /dev/null
--- 2/modules/java/java_test/build.xml
+++ b/modules/java/java_test/build.xml
@@@ -1,0 -1,58 +1,58 @@@
 -              <pathelement location="build/classes"/>
+ <project>
+   <path id="master-classpath">
+     <fileset dir="lib">
+       <include name="*.jar"/>
+     </fileset>
+     <fileset dir="bin">
+       <include name="*.jar"/>
+     </fileset>
+   </path>
+ 
+   <target name="clean">
+     <delete dir="build"/>
+     <delete dir="testResults"/>
+   </target>
+ 
+   <target name="compile">
+     <mkdir dir="build/classes"/>
+ 
+     <javac sourcepath="" srcdir="src" destdir="build/classes" >
+       <include name="**/*.java"/>
+       <classpath refid="master-classpath"/>
+     </javac>
+   </target>
+ 
+   <target name="jar">
+     <mkdir dir="build/jar"/>
+     <jar destfile="build/jar/opencv-test.jar" basedir="build/classes">
+       <manifest>
+       <attribute name="Main-Class" value="org.opencv.test.OpenCVTestRunner"/>
+       </manifest>
+     </jar>
+   </target>
+ 
+   <target name="test">
+     <mkdir dir="testResults"/>
+     <junit printsummary="false" haltonfailure="false" haltonerror="false" showoutput="false" logfailedtests="true" maxmemory="256m">
+       <sysproperty key="java.library.path" path="${javaLibraryPath}"/>
+       <classpath refid="master-classpath"/>
+       <classpath>
++        <pathelement location="build/classes"/>
+       </classpath>
+ 
+       <formatter type="xml"/>
+ 
+       <batchtest fork="yes" todir="testResults">
+       <zipfileset src="build/jar/opencv-test.jar" includes="**/*.class" excludes="**/OpenCVTest*">
+        <exclude name="**/*$*.class"/>
+       </zipfileset>
+       </batchtest>
+     </junit>
+   </target>
+ 
+   <target name="buildAndTest">
+     <antcall target="compile"/>
+     <antcall target="jar"/>
+     <antcall target="test"/>
+   </target>
+ </project>

diff --cc modules/java/java_test/src/org/opencv/test/OpenCVTestRunner.java
index 0000000,4d05304..455f953
mode 000000,100644..100644
--- /dev/null
--- 2/modules/java/java_test/src/org/opencv/test/OpenCVTestRunner.java
+++ b/modules/java/java_test/src/org/opencv/test/OpenCVTestRunner.java
@@@ -1,0 -1,44 +1,44 @@@
 -      return getTempFileName(name);
+ package org.opencv.test;
+ 
+ import java.io.File;
+ import java.io.IOException;
+ import junit.framework.Assert;
+ 
+ import org.opencv.core.Mat;
+ 
+ public class OpenCVTestRunner {
+     public static String LENA_PATH = "";
+     public static String CHESS_PATH = "";
+     public static String LBPCASCADE_FRONTALFACE_PATH = "";
+ 
+     private static String TAG = "opencv_test_java";
+ 
+ 
+     public static String getTempFileName(String extension)
+     {
+         if (!extension.startsWith("."))
+             extension = "." + extension;
+         try {
+             File tmp = File.createTempFile("OpenCV", extension);
+             String path = tmp.getAbsolutePath();
+             tmp.delete();
+             return path;
+         } catch (IOException e) {
+             Log("Failed to get temp file name. Exception is thrown: " + e);
+         }
+         return null;
+     }
+ 
+     static public void Log(String message) {
+         System.out.println(TAG + " :: " +  message);
+     }
+ 
+     static public void Log(Mat m) {
+         System.out.println(TAG + " :: " + m + "\n " + m.dump());
+     }
+ 
+     public static String getOutputFileName(String name)
+     {
++        return getTempFileName(name);
+     }
+ }

diff --cc modules/video/doc/motion_analysis_and_object_tracking.rst
Simple merge