Line ending fix
Added CategoryModel::SetLocalField().
Conflicts:
	applications/vanilla/models/class.categorymodel.php
Merge branch 'master' of github.com:vanillaforums/Garden
Added the {mobile_logo} smarty tag.
Conflicts:
	library/core/class.theme.php
Fixed bug in {mobile_logo}.
Added Gdn_ThemeManager->DesktopTheme() and Gdn_ThemeManager->MobileTheme().
Update the AssetModel and utility/css to take a theme type argument specifying desktop or mobile.
Conflicts:
	applications/dashboard/models/class.assetmodel.php
Fix Request::IpAddress()
Add a separate entry point for rendering POST vs GET on EntryController->RegisterApproval to help track down errors.
Index GDN_UserRole.RoleID.
Merge branch 'master' into stage

Conflicts:
	applications/dashboard/controllers/class.utilitycontroller.php
	applications/dashboard/models/class.assetmodel.php