Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
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
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 git://github.com/pyrocms/pyrocms into 2.2/develop
Fix MSIE conditionals regex in minify output

Some MSIE conditional comments are mangled when minify_content is
enabled, which causes the entire document to be treated as if it is
commented.

Don't know how often pyro updates it's copy of codeigniter, but I have
also submitted this change to EllisLab/CodeIgniter#2120
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Fixes an issue noticed in Pro where bots where getting an error due to
the site specific session table getting set later than events were run
Let text inputs fill filter li's automagically
Can't see muted
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Should be 'and'

Otherwise a valid value like '105078134_1.jpg' passes.