UI
Merge branch 'master' of github.com:GuillaumeLegendre/escapeir-android