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 pull request #2054 from mikezilla/2.1/develop

Add missing param to streams_core update_entry
Field types are now re-gathered when types->update_types() is called. Page
edit was broken because field types weren't reloaded after adding the Page
module's field_types path
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Widgets now can read inside $options the instance_title

This change allow to access the instance_title inside the display view.
Currently you only can read the instance_title in a widget_wrapper.
Merge pull request #2176 from wupsbr/2.1/develop

Widgets now can read inside $options the instance_title
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Add page chunk button (was missing in action)
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch 'release/2.2.0-beta1' into 2.2/develop
Updated REST_Controller with changes from Pro.