poyo
Merge remote-tracking branch 'origin/master'

Conflicts:
	iBeaconSocializer/bin/classes.dex
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusFlowActivity$1.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusFlowActivity.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusListArrayAdapter.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/UpdateActivity$1.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/UpdateActivity$2.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/UpdateActivity.class
	iBeaconSocializer/bin/iBeaconSocializer.apk
	iBeaconSocializer/src/com/spartanapps/ibeaconsocializer/UpdateActivity.java