vs2012 version
Merge branch 'master' of https://github.com/diarkmir/DiarkRep

* 'master' of https://github.com/diarkmir/DiarkRep:
  vs2013

Conflicts:
	Cocos2D/TappyChicken/cocos2d/cocos/2d/cocos2d.vcxproj
	Cocos2D/TappyChicken/cocos2d/cocos/audio/proj.win32/CocosDenshion.vcxproj
	Cocos2D/TappyChicken/cocos2d/external/chipmunk/proj.win32/chipmunk.vcxproj
	Cocos2D/TappyChicken/proj.win32/TappyChicken.vcxproj