Add the image path
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Rename addon types to extensions
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Its just Fluent now
fix default attribute
Load form validation here
Update Variables admin
Update Pages admin
Update stream core views
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/views/entries/form.php
	system/cms/modules/streams_core/views/entries/tabbed_form.php