Emoji: Fix to use proper path.
Allow localcache to be optional / configurable
Merge branch 'master' of github.com:vanilla/vanilla
Allow hasFeature to disable localget/localset
Conflicts:
	library/core/class.cache.php
Remove misinformed local disabler
DBA: FixPermissions
Remove debug
SQLDriver: Add returns to documentation.
Merge pull request #2028 from vanilla/hotfix/sqldriver-docs

SQLDriver: Add returns to documentation.
Merge branch 'master' of github.com:vanilla/vanilla
Update the hour offset check to work with the new definition list.
Merge remote-tracking branch 'origin/hotfix/houroffset' into feature/multisite

Conflicts:
	library/core/class.emoji.php