添加了删除和添加的数据库功能，目前有三个测试按钮，等你那边update后我再最后整一下数据之类的
Update
update
update
Merge branch 'Bran_newBranch' of github.com:ZJU-nyle-zq/MapAlarm

Conflicts:
	MapAlarm.xcodeproj/xcuserdata/dengyonghui.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	MapAlarm/AddEventViewController.h
	MapAlarm/AddEventViewController.m
	MapAlarm/Base.lproj/Main.storyboard