CC 2.0/fr -> CC 3.0/unported
better diff display for conditions_levels
Merge branch 'cc-3-0-unported'
update image properties in db when uploading a new version