Merge branch 'master' into captcha
tree11f12508c77d3db45474d61ebec6414c4beb4488
-rw-r--r-- 337 .classpath
-rw-r--r-- 94 .gitignore
-rw-r--r-- 1022 .project
-rw-r--r-- 2381 AndroidManifest.xml
-rw-r--r-- 35147 COPYING
-rw-r--r-- 2668 build.xml
-rw-r--r-- 960 default.properties
drwxr-xr-x - libs
-rwxr-xr-x 108 postDeploy.sh
-rwxr-xr-x 212 preDeploy.sh
drwxr-xr-x - res
drwxr-xr-x - src