Bugfix for CommentCount watch
Only use MergeConfig on hashes. Lists should be overwrite assignments.
Merge branch 'master' into feature/configparse
Swap the frowning and disappointed emoji.

If :) is a smile then :( is a frown. Language matters.
RemoveMobileUnfriendlyPlugins: unregister all MobileUnfriendly plugins

see: http://vanillaforums.org/discussion/comment/216131/#Comment_216131

PluginManager->UnRegisterPlugin() unregisters by classname, but the
classname isn't always PluginName + 'Plugin'

This causes plugins not to be removed on mobile, regardless of what the
PluginInfo says about mobile-friendlyness.

This fixes that.
Eliminate redundant space in "Edit (X minutes)" options menu item

The $TimeLeft variable already begins with a space (or is empty) and therefore there is no need to add another space between "Edit" and $TimeLeft
Add BeforeGetByUser to DiscussionModel
jQuery to 1.10.2 to match CDN
Include FieldName in ValidationResults

Form method ValidateRule fails to add the field name when creating an error, making the use of inline errors impossible.
Original URL request parameters are lost when going through log in screen
Conversations: Fix hash in activities and popin

Both #latest (popin) and #1234 (activities) weren't working, the actual
ID is #Message_1234
Mentions: Fix for sub directories.
Eliminate unneeded specifity for .ContentColumn

There is no need to precede class .ContentColumn with #Body. That class is only used once `<div class="Column ContentColumn" id="Content">`.
Change docs links to new documentation 

Change link to proper docs.
Merge pull request #2361 from adrianspeyer/patch-20

Change docs links to new documentation
Merge pull request #1980 from vanilla/feature/configparse

Handle overlaying numerical arrays sanely in Gdn_Configuration
Merge pull request #1954 from ryacobi/patch-1

Bugfix for CommentCount watch
Merge pull request #2304 from R-J/patch-28

Eliminate unneeded specifity for .ContentColumn
Merge branch 'master' of github.com:vanilla/vanilla into hotfix/mentions-url

Conflicts:
	index.php
Merge pull request #2281 from vanilla/hotfix/mentions-url

Mentions: Fix for sub directories.