Merge branch 'master' of github.com:tomaskraina/mpc-ibeacon-test