Fixing emailjs dependency
Updated CHANGELOG
Release 1.12.1
Merge branch 'master' into dev/upgrade.jojo

Conflicts:
	package.json