Merge branch 'release/1.2.0' into develop
update happiness-charge
add info property
Merge branch 'master' into develop

Conflicts:
	src/happinesscharge.js
bug fix
Merge branch 'hotfix/honey' into develop
Merge branch 'hotfix/honey'
release
Merge branch 'release/1.2.4'