Fix grunt js build.
Merge branch 'master' of github.com:UKHASnet/UKHASnet-www