Made some other changes

Signed-off-by: Joseph Orilogbon <logbon72@gmail.com>
Merge branch 'master' of https://github.com/yunfandong/droidshare

Conflicts:
	droidTransfer/bin/classes.dex
	droidTransfer/bin/classes/columbia/cellular/droidtransfer/GCMIntentService.class
	droidTransfer/bin/droidTransfer.apk
	droidTransfer/bin/resources.ap_

Signed-off-by: Joseph Orilogbon <logbon72@gmail.com>