Broadcast is now encrypted
Merge branch 'master' of https://github.com/doofmars/Any-Beam

Conflicts:
	Anybeam/src/de/hfu/anybeam/android/MainActivity.java