Camel
Camel
Use the field name son
Allow classing
Convert templates to streams

This helps reduce any wonkiness / inconsistencies
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/views/entries/table.php
	system/cms/modules/templates/js/form.js
	system/cms/modules/templates/views/admin/index.php
	system/cms/themes/pyrocms/css/workless/workless.css
2.3 adjustments
Merge branch 'refs/heads/3.0/develop' into AIWS/production