Fixed bug caused by other manifest.json files
Merge branch 'master' of github.com:sakaiproject/Hilary