Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Add missing param to streams_core update_entry
Display field instructions in user profile form (when present)
Use module/controller notation in _page function

Allows other modules to call "Modules::run('pages/_page',...)" properly (a page 'fallback').
For example, a widgets module is accessed via site.com/widgets, so site.com/widgets/download calls the 'download' controller function. If the controller _remap performed a "Modules::run('pages/_page',...)" for all other requests, fallback pages could exist at site.com/widgets, site.com/widgets/about, etc.
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge pull request #2054 from mikezilla/2.1/develop

Add missing param to streams_core update_entry