new params in emotion according to the new databases
clean up
Merge branch 'master' of github.com:mihaelacr/emotions