Add Grunt + rename assets file
Fixed divers bugs