Merge pull request #1 from yisiwei/dev2

Dev2
1、修改日历mark 改为背景颜色
2、title 左右两个图标适配
3、登录界面
Merge pull request #2 from yisiwei/dev2

1.接种记录修改
Merge remote-tracking branch 'origin/dev2' into dev2

Conflicts:
	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/AboutUsActivity.class
	bin/classes/cn/mointe/vaccination/activity/AddDiaryActivity.class
	bin/classes/cn/mointe/vaccination/activity/AddRecordActivity.class
	bin/classes/cn/mointe/vaccination/activity/AddTwoTypeVaccineActivity.class
	bin/classes/cn/mointe/vaccination/activity/InboxActivity.class
	bin/classes/cn/mointe/vaccination/activity/InboxDetailActivity.class
	bin/classes/cn/mointe/vaccination/activity/LoginActivity.class
	bin/classes/cn/mointe/vaccination/activity/MainActivity$4.class
	bin/classes/cn/mointe/vaccination/activity/MainActivity.class
	bin/classes/cn/mointe/vaccination/activity/NoticeActivity.class
	bin/classes/cn/mointe/vaccination/activity/RegisterBabyActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReservationActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReservationBeforeTodayActivity$MyAdapter.class
	bin/classes/cn/mointe/vaccination/activity/ReservationBeforeTodayActivity.class
	bin/classes/cn/mointe/vaccination/activity/ReservationCalendarActivity$4.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/SettingActivity.class
	bin/classes/cn/mointe/vaccination/activity/SpecificationActivity.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/DiaryAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/DrawerMenuAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/MainVaccinationCursorAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/MyBabyAdapter$ViewHolder.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.class
	bin/classes/cn/mointe/vaccination/fragment/MainTodayFragment.class
	bin/classes/cn/mointe/vaccination/fragment/SlidingMenuFragment.class
	bin/classes/cn/mointe/vaccination/fragment/VaccineDiaryFragment.class
	bin/classes/cn/mointe/vaccination/view/SlideView.class
	gen/cn/mointe/vaccination/R.java
Merge pull request #16 from yuhongjie/dev2

合并