edited block
Merge branch '7.x-2.x' of github.com:QScience/patterns_server into 7.x-2.x
Merge branch '7.x-2.x' of github.com:QScience/patterns_server into 7.x-2.x