[DEVELOPMENT ENVIRONMENT]
* NEW: Conflicting files have now their own editor. Solving conflicts is done from that editor. Beware that binary files are not supported yet!
* NEW: Update french translation.
* BUG: Update some editor icons.
* BUG: Removing files updates the project tree correctly now.
* NEW: Version control: If there is nothing to commit, and if the repository has a remote origin, then pushing is possible.
* NEW: Version control: Implement Git conflict solving.
* NEW: Versino control: Redraw some icons.
e80da99cd7