added-error

About wifi,3g,bluetooth
Merge remote-tracking branch 'origin/master'

Conflicts:
	iBeaconSocializer/bin/classes.dex
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$string.class
	iBeaconSocializer/bin/classes/com/spartanapps/ibeaconsocializer/R$style.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$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
Merge branch 'master' of https://github.com/guts2014/BufferOverflowCyprus

Conflicts:
	iBeaconSocializer/bin/classes.dex

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