Merge branch 'master' into 'master'

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/Lib/CommonLib/CommonDef.h

source/Lib/CommonLib/Contexts.h

source/Lib/CommonLib/Contexts_ecm14.0.inl

source/Lib/CommonLib/IntraPrediction.cpp

source/Lib/CommonLib/IntraPrediction.h

source/Lib/CommonLib/Rom.cpp

source/Lib/CommonLib/Rom.h

source/Lib/CommonLib/Slice.h

source/Lib/CommonLib/TrQuant.cpp

source/Lib/CommonLib/TypeDef.h

source/Lib/CommonLib/Unit.cpp

source/Lib/CommonLib/Unit.h

source/Lib/CommonLib/UnitTools.cpp

source/Lib/CommonLib/UnitTools.h

source/Lib/DecoderLib/CABACReader.cpp

source/Lib/DecoderLib/CABACReader.h

source/Lib/DecoderLib/DecCu.cpp