Add prettify
Merge new Gruntfile
Fix Gruntfile for new fdr structure