Android layout
Merge branch 'master' of https://github.com/vyrp/cerberus