Fix ControlButton zoom
Merge branch 'develop_button_zoom_fix' into develop

Conflicts:
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCControlButton.h