Merge branch 'refs/heads/2.3/patch-choice' into 2.3/develop
Merge branch '2.3/develop' of https://github.com/pyrocms/pyrocms into 2.3/develop
Relation as join awesomeness
Merge branch 'refs/heads/2.3/relation-as-join' into 2.3/develop
Rename form to FormBuilder
Improvements to the formatting system
We no longer have issues with $this->value displaying cached values in the entries table
Merge pull request #3076 from obrignoni/2.3/develop

Boomshakalaka boomskie - 2.3/dev Improvements to formatting system and relation as join feature
Progress
Merge pull request #3077 from obrignoni/2.3/develop

Progress
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/views/entries/table.php