Merge branch 'jui.aries' into jui.develop

Conflicts:
	js/chart/grid/basic.js