removed extra comma in gruntfile.js
removed js script angular.cookies fron index
Merge remote-tracking branch 'upstream/master'