sdfsdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	iBeaconSocializer/bin/classes.dex

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$attr.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$dimen.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$drawable.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$id.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$layout.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$menu.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$string.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$style.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusFlowActivity$1$1.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusFlowActivity$1.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusFlowActivity$2.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/StatusFlowActivity.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$3.class

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/UpdateActivity.class

	iBeaconSocializer/bin/dexedLibs/Parse-1.7.0-29779837bbe72a9453c74499e16fc60b.jar

	iBeaconSocializer/bin/dexedLibs/android-support-v4-64d0550dadbbe7fa30dd5aa4ef229441.jar

	iBeaconSocializer/bin/dexedLibs/estimote-sdk-preview-0c7185ac27d27901df677630994b7422.jar
	iBeaconSocializer/bin/iBeaconSocializer.apk
	iBeaconSocializer/bin/resources.ap_