Set up beacons discovery code.
Improved beacon discovery code.
Merge branch 'master' of https://github.com/lpeancovschi/Cavemen

Conflicts:
	Cavemen.xcodeproj/project.pbxproj
	Cavemen/AppDelegate.m