Merge branch 'master' of github.com:vanillaforums/Garden into stage

Conflicts:
	plugins/cleditor/default.php
Emoji: 
- fixed spelling mistake 
- added method to get assetPath
Emoji: 
- fixed spelling mistake
- added get method for assetPath
UserModel: added rate limit as an option on TagSearch method, so client-side can manipulate result set.
Emoji: moved more popular emoji to top of array for auto-suggest in editor.
UserController: added limit to TagSearch method, similarly to the UserModel, though this is the one that can be manipulated through a string string parameter.
Use array_replace instead of array_merge when loading a config on top of another config.
Merge branch 'stage' into feature/tagging-enhancements
Password reset email object must clear each send
Merge branch 'stage' of github.com:vanillaforums/Garden into stage
Debugger: Rename style.css to debugger.css.
Allow the asset model to use url css files.
Added Gdn_ThemeManager->DesktopTheme() and Gdn_ThemeManager->MobileTheme().
Update the AssetModel and utility/css to take a theme type argument specifying desktop or mobile.
Merge branch 'stage' of github.com:vanillaforums/Garden into stage
Merge branch 'stage' into feature/tagging-enhancements
Rename the scss directories into sass.
Rename the scss directories into sass.
Switch the $ThemeType parameter in AssetModel::CssPath() from the first to an optional third parameter.
Added UserController->Authenticate().