Qual: Renamed table llx_c_civilite into llx_c_civility
field civilite into label in the same table and field civilite into civility in other table
Drop old index
Merge branch 'Upstream/develop'
Problem of merging
Merge branch 'Upstream/develop'
Merge pull request #1820 from aspangaro/develop-trad1

Qual: Renamed table llx_c_civilite into llx_c_civility