Beacon Scan Service
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/GuideFragment.java
Added another button to start beacontest
Created new packages, added possibility to kill service
Merge branch 'master' of https://github.com/HSR-Challenge-Projekt-2014/AndroidApp

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml