fixed error in json file - should jsonlint in grunt
Merge branch 'master' into gh-pages