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$2.class

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

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

	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/UpdateActivity$3.class
	iBeaconSocializer/bin/iBeaconSocializer.apk
	iBeaconSocializer/bin/resources.ap_

	iBeaconSocializer/src/com/spartanapps/ibeaconsocializer/StatusFlowActivity.java