Merge branch 'master' of https://github.com/ekazakov/MarionettePlayground

* 'master' of https://github.com/ekazakov/MarionettePlayground:
  update grunt tasks
Merge branch 'master' of https://github.com/ekazakov/MarionettePlayground

* 'master' of https://github.com/ekazakov/MarionettePlayground:
  Fix extendContext
  move context configuration into files
  Add preprocess task and finish requirejs task