Merge remote-tracking branch 'mstorjo/master'

Conflicts:
	libAACenc/include/aacenc_lib.h
	libAACenc/src/aacenc.cpp
	libAACenc/src/aacenc_lib.cpp
	libAACenc/src/aacenc_tns.cpp
	libAACenc/src/band_nrg.cpp
	libAACenc/src/bitenc.cpp
	libAACenc/src/psy_configuration.cpp
	libAACenc/src/psy_main.cpp
	libAACenc/src/qc_main.cpp
	libAACenc/src/transform.cpp
	libFDK/src/FDK_crc.cpp
	libFDK/src/FDK_tools_rom.cpp
	libFDK/src/dct.cpp
	libFDK/src/fft.cpp
	libMpegTPEnc/src/tpenc_lib.cpp
	libSYS/include/FDK_audio.h