chen 11:30
Merge branch 'master' of https://github.com/leon-lazuli/Moment-Notice

Conflicts:
	MomentsNotice/MomentsNotice.xcodeproj/project.pbxproj

MomentsNotice/MomentsNotice.xcodeproj/project.xcworkspace/xcshareddata/M
omentsNotice.xccheckout

MomentsNotice/MomentsNotice.xcodeproj/project.xcworkspace/xcuserdata/zha
ochen.xcuserdatad/UserInterfaceState.xcuserstate
	MomentsNotice/MomentsNotice/MNAppDelegate.m
	MomentsNotice/MomentsNotice/MNEvent.h
	MomentsNotice/MomentsNotice/MNEvent.m
	MomentsNotice/MomentsNotice/en.lproj/MainStoryboard.storyboard
	MomentsNotice/futureEventsTableViewController.m