Merge
Merge branch 'master' of github.com:tquantin/Escape-IR-Android