from pc 20141201
Merge branch 'master' of github.com:andotrue/sample_project2