Merge branches 'filling-in-layout' and 'filling-in-layout' of https://github.com/orgpark/sample_app into filling-in-layout
5.5 conclusion