Delete manifest.mf
Merge origin/master