Merge branch 'bugfixes'
small bugs fixed
Merge branch 'master' into bugfixes
position of active emotion adjusted