Merge pull request #3286 from ace20022/tokenize

Move TokenizeStringUtils and replace CStdStrings by std::strings.

diff --cc xbmc/Util.cpp
Simple merge

diff --cc xbmc/filesystem/CurlFile.cpp
Simple merge

diff --cc xbmc/filesystem/ZipDirectory.cpp
Simple merge

diff --cc xbmc/peripherals/Peripherals.cpp
Simple merge

diff --cc xbmc/utils/StringUtils.cpp
Simple merge

diff --cc xbmc/utils/StringUtils.h
Simple merge

diff --cc xbmc/win32/WIN32Util.cpp
Simple merge