Merge branch 'hotfix/fix140905'
fix bug
Merge branch 'hotfix/fix0919'
Merge branch 'master' of github.com:toshiotm/sample