Provided a fallback for when there is no active module (such as on the Dashboard)
Resolved a merge conflict from pull request earlier
Keep from fetching a user record if we're already working with the logged in user
Switched a redirect query to use the query builder, removed unused Postgres code
Added a check back in for page's that 404
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge pull request #2113 from petsagouris/enhancement/blog_module_visual_bugs

[2.2/develop] Fixing visual bugs in blog module
We have a standard. ALL field types, widgets, modules, themes, plugins must have three digit versions. We require that on the store and as we hope to begin using an auto-updater this is necessary
Merge branch 'bug/various-fixes' of git://github.com/chadwithuhc/pyrocms into 2.2/develop
Missed echo from site_url links.
Added correct delete confirm message to blog index
Fixing formatting on plugins

Angry Phil is angry. >:o
Set up syncronous content loading in Files. Fixes #1764
This keeps Files from opening many concurrent requests to the server and
killing it with all it's image resize requests. This can be a problem when
a user uploads a huge list of images at once. When the upload completes the folder pane
is loaded and the old way simply appended all the image tags instantly
Added a tooltip for when file and folder names are to long to display
Fixes #1689. File ids or now hashes instead of auto increment.
Nothing should change about how they are used but you will now see 15 character
alpha numeric ids instead of numeric.
Implemented $skips functionallity for field_form
Enhance slug field to accept accented chars
Fixing sub section arrow alignment.
Added breadcrumb support to files. Also display first folder by url hash:
such as site.com/admin/files#some-folder/sub-folder/folder-to-show
Closes #1666
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop