Fixed more coflict stuff
added french data
Too much to list
small fix
Merge pull request #473 from shutter111/development

Too much to list