Formatting
Added uuid filter parameter.
Added some comments
Preparing for merge
Merge with dev
test commit
Merge
Merge branch 'master' of https://github.com/myriadmobile/simple-ibeacon