FIX RAT
Merge remote-tracking branch 'origin/master'

Conflicts:
	warCPP/res.qrc
Merge branch 'master' of https://github.com/jcambray/ProjetWarCPP