commit
Merge branch 'master' of https://github.com/tgioihan/ConGaiXinh

Conflicts:
	bin/ConGaiXinh.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/appota/congaixinh/MainActivity$2.class
	bin/classes/com/appota/congaixinh/MainActivity$PagerAdapter.class
	bin/classes/com/appota/congaixinh/MainActivity.class
	bin/classes/com/appota/congaixinh/R$id.class
	bin/classes/com/appota/congaixinh/R$string.class
	bin/classes/com/appota/congaixinh/R$styleable.class
	bin/classes/com/facebook/android/R$id.class
	bin/dexedLibs/facebook-abacf2e832f5d75f92dca655c15424c9.jar
	bin/dexedLibs/library-dfcc9fd20c3855931549628e6b314fb1.jar
	bin/resources.ap_
	gen/com/appota/congaixinh/R.java
	gen/com/facebook/android/R.java
	src/com/appota/vn/network/HttpHelper.java