Initial update. Working with grunt 0.4
Merge branch 'master' into jquerypp