Additional base module features #148
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	jui.chart.min.js
	jui.min.js