add mood states
merge
Merge branch 'master' of https://github.com/chcculle/mood-server
merge
Merge branch 'master' of https://github.com/chcculle/mood-server