Gestion des Conventions : Add, Edit, Delete
add files social
fixed conflic convention
fusion
js design comment + tags
delete debug
js places
add a new character name
Merge branch 'master' of https://github.com/larpomatic/gnk
ré-ajout de l'objecttype dans place et resources.gsp
Merge remote-tracking branch 'origin/master'
problem in publication fixed
Merge branch 'master' of https://github.com/larpomatic/gnk into coppee_p