Added json/jsonp vulnerability protection
Merge commit '3383c0d' into tutorial_2