Save LocalizeStrings.cpp and XBMChttp.cpp with advanced option to avoid lossing info in systems other than English like Chinese
Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/guilib/LocalizeStrings.cpp
	xbmc/interfaces/http-api/XBMChttp.cpp
Save LocalizeStrings.cpp and XBMChttp.cpp as Unicode - Codepage 1200 to avoid error when compiling in CJK eastern language systems
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/guilib/LocalizeStrings.cpp
	xbmc/interfaces/http-api/XBMChttp.cpp
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'