Merge branch 'master' of https://github.com/paullin/sample_app
Merge branch 'master' of https://github.com/paullin/sample_app