xxx
no message
Merge branch 'master' into masterx

* master:
  no message
  xxx

Conflicts:
	.gitignore
	iBeacon Simulator.xcodeproj/project.xcworkspace/xcuserdata/Cephei.xcuserdatad/UserInterfaceState.xcuserstate