resolve 3
Merge branch 'master' of https://github.com/khamkham/crowd-watson