Reorder logic in admin_controller to allow for more control over the menu
Merge branch 'refs/heads/production' into 3.0/develop

Conflicts:
	system/cms/core/Admin_Controller.php
No need to attach the profile, its a relation
Add ability to override the User class used by Sentry
Add getEntryModelClass() to the StreamModel
Optimize frontend queries by updating the streams parser
Fix image output
Don't use streams
Get variables using new streams model
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop

Conflicts:
	system/cms/modules/users/events.php
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Merge branch 'refs/heads/3.0/develop' into production

Conflicts:
	system/cms/modules/users/events.php