Fix merge conflicts. run grunt dev and grunt.

2 jobs for issue55