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
don't blow away existing theme_settings variable #2652
Merge pull request #5041 from openscholar/vsite-favicon-variable

Vsite favicon variable