Saved work in progress
Merge branch 'master' of https://github.com/yunfandong/droidshare
Fixed registration and GCM app ID issue
Conflicts:
	droidTransfer/bin/classes.dex
	droidTransfer/bin/classes/columbia/cellular/droidtransfer/UploadActivity.class
	droidTransfer/bin/droidTransfer.apk
	droidTransfer/bin/resources.ap_
Merge branch 'master' of https://github.com/yunfandong/droidshare

Conflicts:
	droidTransfer/bin/classes/columbia/cellular/droidtransfer/MainActivity$7.class
	droidTransfer/bin/classes/columbia/cellular/droidtransfer/MainActivity$MyAdapter$1.class
	droidTransfer/bin/classes/columbia/cellular/droidtransfer/MainActivity$MyAdapter.class
	droidTransfer/bin/classes/columbia/cellular/droidtransfer/MainActivity.class

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