fix framework
Merge branch 'develop' into feature/remove_deprecated_function

Conflicts:
	framework/cc/ui/UISlider.lua