Merge branch 'EMDM-Highlight'

Conflicts:
iBeacons Demo.xcodeproj/project.pbxproj
iBeacons Demo/Main-iPad.storyboard
iBeacons Demo/Main.storyboard
iBeacons Demo/ViewController.m
Fixed Merged conflicts