Enhanced notification, added buttons to notification
Merge branch 'master' of https://github.com/HSR-Challenge-Projekt-2014/AndroidApp

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/ch/hsr/challp/museum/service/BeaconScanService.java