Changed layout
Merge branch 'master' of https://github.com/hujunyi/sample_app
Changed layout