mmm
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/phillyvip/pocketvip/view/MainActivity.java
qqqqqqq
Merge branch 'master' of ssh://git@github.com/stpddream/BlackMaster.git

Conflicts:
	bin/PocketVIP.apk
	bin/classes.dex
	bin/resources.ap_