anticonflit
Merge branch 'master' of https://github.com/ruizb/Themis
Merge des changements sur SQLManager de Tristou et Nathan