use media root for user generated files, stabilised import of results
resolved conflicts