Added correct MIME type for .webapp manifest
Merge branch 'dev', remote branch 'origin'