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.
tests for the database authentication during the install process
travis and phpunit.xml changes
changing host
Merge branch 'feature/selenium' of github.com:pyrocms/pyrocms into feature/selenium
Breaking for travis.
Exclude 2.0 and 2.1 from Seleniums activities, and test with 5.4.
changing the file names of the tests and making changes to travis
removing a stupid sleep
adding the missing db field test
adding the missing db field test
fixing that assertion
fixing that assertion
trying a shared session
adding unwritable file structure test