Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Plus/minus signs now visible when menu items are nested in navigation page. Also more centred vertically on navigation and pages lists (tested on latest chrome/firefox).
Merge branch '2.2/develop' into 2.2/nav_styles

Resolved conflict in system/cms/modules/pages/css/index.css (replaced mine with newer version)
Show the page type when viewing page summaries.
Add columns for alt_processed fields too

Otherwise when we get data - they can be skipped because the column doesn't exist.

Also helpful cause the value stored may be related to its use.
Return null for 'dummy' value too.
Couple more safety check's for "dummy"

To keep it out of the database. The previous commit will prevent users using beta to have to remove the dummy from their db too.
Merge pull request #2238 from jaminday/2.2/show_page_type

Fix for Issue #2224: Show page type when viewing page summary
Merge pull request #2236 from jaminday/2.2/nav_styles

Plus/minus signs now visible with nested items in navigation page
Fixed issue #2237: No admin backend for search

There is not actually a backend for search, but there was going to be for a while. 2.3 will probably add some cool statistics and the like, but for now there is no admin search stuff at all.
Fixed setting validation.
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop
Fixed issue #2205: Editing navigation links had no content.
The dark background bled over the input all nasty
Fixes issue #2242, only images with Lex tags will disable the URL field of the Image dialog
Merge pull request #2245 from dresfdez/hotfix/2242

Fixes issue #2242, only images with Lex tags will disable the URL field ...
Default Theme

updated lots of style and layout stuff for the default website theme

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Default Theme Updates

- updated various styles for default theme
- added font face

Signed-off-by: Joshua Pekera <joshuapekera@me.com>