Update json_plan_operations.rst
Update json_plan_operations.rst
Merge branch 'master' of http://github.com/kateyy/hyrise
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into feature/SubString