change map set
Merge branch 'master' of https://github.com/slowfall/meeting
modified create activitys
modified create activitys again
merge code