Too many Rs
Merge pull request #767 from andykorth/v3.0

Too many Rs
Merge branch 'v3.0' of github:cocos2d/cocos2d-iphone into v3.0
Update CCSlider.m

Fixing iOS version to not respond to dragging when self.enabled == NO.
Mac version was already ok.
Fixing a doc comment.
Merge pull request #781 from richardgroves/patch-1

CCSlider can be dragged on iOS when !enabled
Fixing documentation typos
Merge pull request #790 from richardgroves/patch-1

Fixing documentation typos - CCNodeMultiplexer
Merge branch 'v3.0' of github.com:cocos2d/cocos2d-iphone into v3.0
Styled TTF label tests.
Merge branch 'v3.0' into develop

Conflicts:
	cocos2d-ui-tests/osx/AppDelegate.m
Invert shadow offsets for TTF labels.