左边栏咨询模块
Merge branch 'master' of https://github.com/FandLee/qwas

Conflicts:
	ADCalendar.xcodeproj/project.pbxproj
主页
Merge branch 'master' of https://github.com/FandLee/qwas

Conflicts:
	ADCalendar.xcodeproj/project.pbxproj
	ADCalendar/ADNewEventController.m
ios7
Merge branch 'master' of https://github.com/FandLee/qwas

Conflicts:
	ADCalendar.xcodeproj/project.pbxproj
	ADCalendar/ADViewController.m
	ADCalendar/ADWeatherView.m