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