Fixes #486
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3

Conflicts:
	cocos2d-ui/CCButton.m