。。
Merge branch 'developer' of https://github.com/ibeaconsz/ibeacon into developer

Conflicts:
	Ibeacon.xcodeproj/project.pbxproj
	Ibeacon/Base.lproj/Main.storyboard
khj
f
kjk