Fixed image gallery filesize warning #2869

There were 2 file size validators present.  The first printed a warning, but didn't validate.  The second wasn't available for a warning, but did validate.  I updated the first to show the smaller of the two filesizes (the default php_max_upload or the field's 6mb).
Add example items to CSV template files.
Fix comments.
Allow AJAX on cp_settings_form with inc files
Add form_alter and form_submit for favicon setting
formatting & comments
resolve merge conflicts
resolve merge conflicts
refactor to use variable, not field
Allow upload and save of variable file
Remove favicon logic from os.module

Only belongs in vsite.module for multi-tenant installs.
Add default favicon settings to vsite.module
Fix layout of search widget on home page.
Add and verify working, canonical rel prev/next link tags
don't blow away existing theme_settings variable #2652
Fix printing condition of db serach widget.
fix events behat tests.
Merge pull request #5072 from openscholar/5051-tests-fix

Fix behat tests (events)
Merge pull request #5068 from openscholar/5050

Fix layout of search widget on home page when using Solr.
Refactor, consolidate pager theme funcs #5059