Fixed folder location in manifest file.
Merge branch 'dev'