Merge branch 'master' of github.com:AltBeacon/android-beacon-library
Merge branch 'master' of github.com:AltBeacon/android-beacon-library