closed #4163: add cceditbox to winrt
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into CCEditBox_winrt

Conflicts:
	extensions/proj.winrt/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/proj.winrt/TestCpp.vcxproj.filters
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into CCEditBox_winrt
build for winrt vs2013
Merge pull request #5805 from koowolf/CCEditBox_winrt

closed #4163: add cceditbox to winrt
Merge remote-tracking branch 'upstream/master'