added 2 additional fields to mood submission
server cleanup
merge files