string
Merge remote-tracking branch 'origin/master'

Conflicts:
	android-beacon-library/bin/android-beacon-library.jar