Merge branch 'feature/get-img-from-local' of http://git.choozmo.com:3000/choozmo/bhouseWeb into feature/get-img-from-local