Merge branch 'master' of https://github.com/apptool/otgri

Conflicts:
IOS/Otgri/.DS_Store
ds_store conflict