messagePost, calendar join game
fixed conflicts

Conflicts:
	db.sqlite3