OSS-74: added missing files
Merge branch 'master' into gh-pages

* master:
  OSS-74: added missing files
updated var directory
rename chart_demo to mashup_demo
Merge branch 'master' into gh-pages

* master:
  rename chart_demo to mashup_demo