Started iBeacon
Merge remote-tracking branch 'origin/master'
Started beacon stuff
Merge remote-tracking branch 'origin/master'