ww
sdMerge branch 'master' of https://github.com/lib4/dump

Conflicts:
	Appbase-master/bin/Appbase.apk
	Appbase-master/bin/classes.dex
	Appbase-master/bin/classes/com/appbase/R$id.class
	Appbase-master/bin/classes/com/appbase/R$integer.class
	Appbase-master/bin/classes/com/appbase/R$layout.class
	Appbase-master/bin/classes/com/appbase/R$menu.class
	Appbase-master/bin/classes/com/appbase/R$string.class
	Appbase-master/bin/classes/com/appbase/R$style.class
	Appbase-master/bin/classes/com/appbase/R$styleable.class
	Appbase-master/bin/dexedLibs/android-support-v4-417ca22e435b72409a55f659007e2125.jar
	Appbase-master/bin/dexedLibs/commons-validator-1.4.0-fe2ad781b0e5bac5792a33dc3804f6c1.jar
	Appbase-master/bin/dexedLibs/estimote-sdk-preview-ef711b64eff001a9067d682d181a91c6.jar
	Appbase-master/bin/dexedLibs/google-play-services-196bf10a9205078c0822fc26560e2c09.jar
	Appbase-master/bin/dexedLibs/google-play-services_lib-45d7113b07e2c7d30f24d8b0fd1697ec.jar
	Appbase-master/bin/dexedLibs/guava-15.0-bbb29a610bf058a3c5460ec22cd74369.jar
	Appbase-master/bin/dexedLibs/jackson-core-2.3.1-b06805c2ca07f87df9d54340aade53d7.jar
	Appbase-master/bin/resources.ap_