Replacing data with the type itself for ULTIMATE coolness
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/views/fields/form_input_row.php
Revert "Replacing data with the type itself for ULTIMATE coolness"

This reverts commit 156a48a371762720f6312fdb94af9a876366105b.
Winner
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/views/fields/form_input_row.php
Syncing lost differences with 3.0
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/src/Pyro/Module/Streams_core/AbstractFieldType.php
	system/cms/modules/streams_core/src/Pyro/Module/Streams_core/EntryModel.php