emotion engine update
Merge branch 'master' of https://github.com/Forwaistee/JBdiEmo-the-game

Conflicts:
	nbproject/private/private.properties