Improving :@ comment
Merge commit '7d01cdd2fe2dbbd83ee595b4fde0a2183b70ade9' into develop

Conflicts:
	emojify.js