Small changes
New model
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/src/Pyro/Module/Streams_core/EntryModel.php
	system/cms/modules/templates/controllers/admin.php
Merge branch '3.0/develop' of github.com:pyrocms/pyrocms into 3.0/develop