Merge pull request #909 from linshun/iss2085_v2.1.2beta2

issue #2085: update version number.
fixed #2082 Add a file to build.xml
Merge pull request #910 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 Add a file to build.xml
issue #2085: update submodule commit ID.