OOC_ch2 good to go whith 2.5
tmp version, merge github in a  sec
Merge remote-tracking branch 'choose_remote_name/master'
complete ch2
complete ch2
ch1
Merge remote-tracking branch 'choose_remote_name/master'