readme update
Merge branch 'master' of https://github.com/Estimote/beacons-demo

Conflicts:
	README.md