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

Conflicts:
	Ibeacon/ViewController.m
wpeiropwoerkwerwerwerwe
Merge branches 'developer' and 'developer' of https://github.com/ibeaconsz/ibeacon into developer
lsearjlaesjf
sdlfkj
Merge branch 'developer' of https://github.com/ibeaconsz/ibeacon into developer

Conflicts:
	Ibeacon.xcodeproj/project.pbxproj
	Ibeacon/Base.lproj/Main.storyboard
234234