new editing
Merge remote branch 'remotes/origin/master'
move odg files from static/images to image_base/
Merge remote branch 'remotes/origin/master'