Choice filter method progress
Fixing filters in 2.3 theme
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/field_types/choice/field.choice.php
	system/cms/modules/streams_core/src/Pyro/Module/Streams_core/Core/Model/Query/EntryBuilder.php
	system/cms/themes/pyrocms/views/admin/partials/streams/filters.php