rework demo to show background control and to show example of simulating iBeacons
Merge branch 'master' of github.com:RadiusNetworks/android-ibeacon-reference

Conflicts:
	project.properties