During friday
test33333
Merge branch 'test'

Conflicts:
	bin/R.txt
	bin/UITest.apk
	bin/classes.dex
	bin/classes/com/example/uitest/MainActivity.class
	bin/classes/com/example/uitest/Maps$GetPlaces.class
	bin/classes/com/example/uitest/Maps.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
	bin/classes/com/example/uitest/Tab2Fragment.class
	bin/dexedLibs/android-support-v4-204e384177fcc05b26972d0d7e374d2f.jar

bin/dexedLibs/google-play-services_lib-5310a67143bc83756fa92b19c663c869.
jar
	bin/resources.ap_
	gen/com/example/uitest/R.java
	res/layout/login.xml
	res/layout/maps.xml
	res/layout/signup.xml
	src/com/example/uitest/Tab2Fragment.java
12345678