Merge branch 'develop' of C:\Users\Jayden\WebstormProjects\jui with conflicts.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	jui.chart.min.js
	jui.min.js
Merge branch 'develop' of C:\Users\Jayden\WebstormProjects\jui with conflicts.
fixed focus brush bug
add scale.type(is grid type) property