Fix class paths
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/field_types/user/src/Pyro/FieldType/User.php
Correct paths
Merge branch 'refs/heads/3.0/develop' into production