AAA

AAA
Merge branch 'master' of https://github.com/forrester0987/com.waterstart.loginexample

Conflicts:
	plugin.xml
	src/android/LoginTools.java