提醒数据修改
Merge pull request #19 from yuhongjie/dev2

Dev2
1.title修改
2.选择城市修改
3.其它
Merge remote-tracking branch 'origin/dev2' into dev2

Conflicts:
	bin/classes/cn/mointe/vaccination/R$drawable.class
	bin/classes/cn/mointe/vaccination/R$id.class
	bin/classes/cn/mointe/vaccination/R$integer.class
	bin/classes/cn/mointe/vaccination/R$layout.class
	bin/classes/cn/mointe/vaccination/R$string.class
	bin/classes/cn/mointe/vaccination/R$style.class
	bin/classes/cn/mointe/vaccination/R$styleable.class
	bin/classes/cn/mointe/vaccination/activity/AddDiaryActivity$MyAdapter.class
	bin/classes/cn/mointe/vaccination/activity/AddDiaryActivity.class
	bin/classes/cn/mointe/vaccination/activity/GuideActivity$MyPagerChangeListener.class
	bin/classes/cn/mointe/vaccination/activity/InboxActivity.class
	bin/classes/cn/mointe/vaccination/activity/LoginActivity.class
	bin/classes/cn/mointe/vaccination/activity/MainActivity.class
	bin/classes/cn/mointe/vaccination/activity/RegisterBabyActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReservationActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReservationCalendarActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReservationVaccineActivity$MyOnClickListener.class
	bin/classes/cn/mointe/vaccination/activity/ReservationVaccineActivity$MyPageChangeListener.class
	bin/classes/cn/mointe/vaccination/activity/ReservationVaccineActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReserveActivity.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$1.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$2.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$3.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$4.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$5.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$6.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$7.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$8.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity$9.class
	bin/classes/cn/mointe/vaccination/activity/VaccinationDetailActivity.class
	bin/classes/cn/mointe/vaccination/activity/VaccineChooseActivity.class
	bin/classes/cn/mointe/vaccination/activity/VaccineIntroActivity$IntroAdapter.class
	bin/classes/cn/mointe/vaccination/activity/VaccineIntroActivity.class
	bin/classes/cn/mointe/vaccination/adapter/BabyAdapter$BabyBtnOnClickListener.class
	bin/classes/cn/mointe/vaccination/adapter/BabyAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/InboxAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/MyBabyAdapter$BabyBtnOnClickListener.class
	bin/classes/cn/mointe/vaccination/adapter/MyBabyAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/SortAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/SummaryVaccinationAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/VaccinationCategoryAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/VaccinationCursorAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/VaccinationInfoAdapter.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$1.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$10.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$11.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$12.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$2.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$3.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$4.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$5.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$6.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$7.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$8.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment$9.class
	bin/classes/cn/mointe/vaccination/fragment/MainFragment.class
	bin/classes/cn/mointe/vaccination/fragment/SlidingMenuFragment.class
	bin/classes/cn/mointe/vaccination/view/ClearEditText.class
	bin/classes/cn/mointe/vaccination/view/SideBar.class
	gen/cn/mointe/vaccination/R.java
Merge pull request #4 from yisiwei/dev2

Dev2