Force resolve conflicts / Updated TODO
Save / Load language | Updated fr
Better changelog render
Option to choose update behavior

- Updated translations
Merge remote-tracking branch 'origin/devel'