Included .json data files in gruntfile.js

Refactored styles in demo app to demo.css
Refactored explicit controldata assignment to use watches instead
Merge branch 'master' of https://github.com/AgronKabashi/TemplateEngine