S5 edify_defs
Merge branch 'master' of https://github.com/mrimp/Android-Kitchen