layout
Merge branch 'master' of https://github.com/Cocktailor/android