Finish layout and routes
Merge branch 'master' of https://github.com/marqia/sample_app2