Fix DiscussionModel->SetField() for arrays.
Use the correct asset path for emoji images.
Merge branch 'feature/multisite' of github.com:vanilla/vanilla into feature/multisite

Conflicts:
	library/core/class.emoji.php