Merge pull request #3 from yisiwei/dev2

Dev2
1.修改详情界面2.修改补录选择时间3.日历完成背景
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/LoginActivity.class
	bin/classes/cn/mointe/vaccination/activity/RegisterBabyActivity.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/SortAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/VaccinationCategoryAdapter.class
	bin/classes/cn/mointe/vaccination/adapter/VaccinationCursorAdapter.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$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/MainTodayFragment.class
	gen/cn/mointe/vaccination/R.java
	src/cn/mointe/vaccination/fragment/MainFragment.java
Merge pull request #19 from yuhongjie/dev2

Dev2