[tr2]: Minor gruntfile.js fixes
[tr2]: Basic new integration scheme working (fixes yet to be made)