commit before pull
Merge branch 'master' of git@github.com:list88zhu/ShanNianApp.git

Conflicts:
	ShanNianApp/src/com/android/shannian/activity/HomeActivity.java
增加日历view
add CalendarFlipper