Jobbbbbb
Merge branch 'master' of https://github.com/MarkusAlexander/IbeaconUserApp

Conflicts:
	iBeaconImg/iBeaconImg/bin/Debug/iBeaconImg.dll.mdb
	iBeaconImg/iBeaconImg/obj/Debug/assemblies/iBeaconImg.dll.mdb
	iBeaconImg/iBeaconImg/obj/Debug/iBeaconImg.csproj.FileListAbsolute.txt
	iBeaconImg/iBeaconImg/obj/Debug/resolved_assemblies.txt