1.9.6 r3
Merge branch 'master' of https://github.com/Jyru-Ken/DevProLauncher

Conflicts:
	Language/French/cards.cdb