merge
All iBeacon functionality working except for accuracy. Trying to improve now.