Move emoticon_tags to emoticons_tags for consistency
Update calls to emoticons_tags
Merge branch 'feature/rename-tag-library' into develop