Mapper Conflicts Resolved
Merge branch 'master' of https://github.com/innoist/ES