Merge branch 'macro_removal' into 'master'

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/Lib/CommonLib/CommonDef.h

source/Lib/CommonLib/ContextModelling.cpp

source/Lib/CommonLib/ContextModelling.h

source/Lib/CommonLib/DepQuant.cpp

source/Lib/CommonLib/QuantRDOQ.cpp

source/Lib/CommonLib/TrQuant.cpp

source/Lib/CommonLib/TypeDef.h

source/Lib/CommonLib/Unit.cpp

source/Lib/CommonLib/Unit.h

source/Lib/CommonLib/UnitPartitioner.cpp

source/Lib/CommonLib/UnitPartitioner.h

source/Lib/CommonLib/UnitTools.cpp

source/Lib/CommonLib/UnitTools.h

source/Lib/DecoderLib/CABACReader.cpp

source/Lib/DecoderLib/CABACReader.h

source/Lib/DecoderLib/VLCReader.cpp

source/Lib/EncoderLib/CABACWriter.cpp

source/Lib/EncoderLib/CABACWriter.h