Added notifications for estimote beacons
Added notifications for estimote beacons
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/jeff/tester2/MainActivity.java
plaatje