Modify file names
Modify mac project
Modify windows project file
Merge branch 'master' into master_nutty_modifyfilenames
Merge branch 'master' into master_nutty_modifyfilenames

Conflicts:
	extensions/Android.mk
	extensions/proj.emscripten/Makefile
	extensions/proj.linux/Makefile
	extensions/proj.nacl/Makefile
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
modify iOS and mac project
Fixed bugs
Merge pull request #4084 from nutty898/master_nutty_modifyfilenames

Master nutty modifyfilenames