Bugfix for CommentCount watch
Only use MergeConfig on hashes. Lists should be overwrite assignments.
Merge branch 'master' into feature/configparse
Add types to the safeHeader() docblock.
Add missing character sets to the http content types.
Add the character set to the dispatcher.

Note that the line-endings were also changed in this commit.
Default the character set to utf-8.
Make sure the category child ids are an array before iterating.
Take the changed username when connecting through SSO.
Add hasEditProfile() to determine whether or not a user has edit profile options.

This centralizes the check to profile editing and also allows profile editing if titles or locations are turned on. Currently there is no way to edit titles or locations if you use SSO.
Use the global hasEditProfile() for checks to use the edit profile button.
Fix some double translations.
Add support for file upload schemes.
Make checks for urls more explicit so as not to catch custom scheme urls.
Convert tabs to spaces in GDN_Upload
Set context to null before using
Bump version to bust cache.
Make format checking case-insensitive.
Merge pull request #2293 from vanilla/hotfix/case-insensitive-formats

Make format checking case-insensitive.
Merge pull request #2269 from vanilla/hotfix/category-childids

Make sure the category child ids are an array before iterating.