change Question and ESClient to try and make it work
Merge branch 'master' of https://github.com/CMPUT301F14T16/QuestionAppProject