clean up manifest, handle nested userContentWrapper nodes
Merge branch 'master' of github.com:supdegrave/Antiviral