Merged dev

* Updated demo app
* Added grunt