Merge branch 'master' of https://github.com/JoeCao/meetingroom

Conflicts:
	db/meeting.db