Merge development back into master

The export should now work with rewrites other than 1 (.htaccess) - including images and so on. I tested it on a basic installation on Windows IIS as well.