Merge branch 'master' into prod
Merge branch 'master' into prod
CC 2.0/fr -> CC 3.0/unported
Merge branch 'master' into prod
Merge branch 'master' into prod
for summit-summit association & co, precise association direction

TODO: best is being able to make both directions associations from the page
remaining prototype-specific code
forums buttons
better diff display for conditions_levels
Merge branch 'cc-3-0-unported'
update image properties in db when uploading a new version
banner montania
Merge remote-tracking branch 'origin/master' into prod
validate function should be loaded even if dnd not supported
Merge branch 'master' into prod
outings wizard hotfix
Merge branch 'prod'
10 sorties sans voiture autour de Grenoble, éd 2
10 sorties gre, file names
email domain spelling suggestions on registration