Implemented beacon discovery
Merge branch 'master' of https://github.com/Ramshandilya/Naatamai

Conflicts:
	Naatamai.xcodeproj/project.pbxproj