-merge
merge
merge mood panel & calendar