fix image upload path for new files
Merge branch 'master' into gh-pages
rebuild