.
。
l
d
Merge branch 'jay' into developer

Conflicts:
	Ibeacon.xcodeproj/project.xcworkspace/xcshareddata/Ibeacon.xccheckout
s