CL: Merge conflict
CL: Strip all Testing
Merge branch 'master' of https://github.com/xtreme-christopher-larsen/iBeaconModule