[mr3117] fix cmakefiles after mr3116
[mr3118] possible fix VC10 problems (not tested)
[mr3119] fix some possible problems with AI update after mr3106
SD2 update