测试

Signed-off-by: liuyajun <liuyajun52@gmail.com>
Merge branch 'master' of https://github.com/MD5TEAM/MD5PrivacySafe2.git

Conflicts:
	src/com/md5team/md5privacysafe2/encryption/EncryFileAsyncTask.java