test 1
Merge branch 'master' of https://github.com/mason-lee/UITest-5

Conflicts:
	bin/classes/com/example/uitest/MainActivity.class
	bin/classes/com/example/uitest/R$id.class
	bin/classes/com/example/uitest/R$layout.class
	bin/classes/com/example/uitest/R$menu.class
	bin/classes/com/example/uitest/R$string.class
	bin/classes/com/example/uitest/R$style.class
	bin/classes/com/example/uitest/R$styleable.class
	bin/classes/com/example/uitest/SQLExample.class
	bin/classes/com/example/uitest/SQLView.class
	gen/com/example/uitest/R.java
	res/layout/login.xml