提交代码
提交代码
commit code

commit code
Merge remote-tracking branch 'origin/master'

Conflicts:
	MeetingComing/res/layout/calendar_view_activity.xml
	MeetingComing/res/layout/toast_self_define.xml

	MeetingComing/src/com/ctrlz/meetingcoming/handler/MeetingsToHandler.java