Synched up French translation
Merge branch 'master' into bootstrap3
Merge origin/bootstrap3 and fix conflicts