second commit
Merge branch 'master' of https://github.com/wy12345/Android-Projects

Conflicts:
	ThirtyDayChallenge/.classpath
	ThirtyDayChallenge/AndroidManifest.xml
	ThirtyDayChallenge/bin/AndroidManifest.xml
	ThirtyDayChallenge/bin/ThirtyDayChallenge.apk
	ThirtyDayChallenge/bin/classes.dex
	ThirtyDayChallenge/bin/classes/com/calendar/adapters/CalendarAdapter.class
	ThirtyDayChallenge/bin/classes/com/calendar/adapters/CustomAdapter.class
	ThirtyDayChallenge/bin/classes/com/calendar/adapters/ImageAdapter.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/ActualCalendar$1.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/ActualCalendar.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/Calendar.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/GoalInputDialog.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/GoalsFragment$1.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/GoalsFragment.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/MainScreen.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/PrevGoalsFragment.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$attr.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$color.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$dimen.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$drawable.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$id.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$layout.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$menu.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$string.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R$style.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/R.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/SimpleCalendar$1.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/SimpleCalendar$2.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/SimpleCalendar.class
	ThirtyDayChallenge/bin/classes/com/calendar/main/XDialog.class
	ThirtyDayChallenge/bin/resources.ap_
	ThirtyDayChallenge/gen/com/calendar/main/R.java
	ThirtyDayChallenge/project.properties
	ThirtyDayChallenge/res/drawable/gridview_bg.xml
	ThirtyDayChallenge/res/drawable/gridview_bg2.xml
	ThirtyDayChallenge/res/drawable/gridview_ondate_bg.xml
	ThirtyDayChallenge/res/layout/calendar_item_layout.xml
	ThirtyDayChallenge/res/layout/calendar_layout.xml
	ThirtyDayChallenge/res/layout/main_calendar.xml
	ThirtyDayChallenge/res/values/colors.xml
	ThirtyDayChallenge/res/values/strings.xml
	ThirtyDayChallenge/res/values/styles.xml
	ThirtyDayChallenge/src/com/calendar/adapters/CalendarAdapter.java
	ThirtyDayChallenge/src/com/calendar/main/ActualCalendar.java
	ThirtyDayChallenge/src/com/calendar/main/GoalsFragment.java
	ThirtyDayChallenge/src/com/calendar/main/SimpleCalendar.java
	WalkingTracker/.classpath
	WalkingTracker/AndroidManifest.xml
	WalkingTracker/bin/AndroidManifest.xml
	WalkingTracker/bin/classes/com/tracker/Database.class
	WalkingTracker/bin/classes/com/tracker/Log.class
	WalkingTracker/bin/classes/com/tracker/LogView.class
	WalkingTracker/bin/classes/com/tracker/R$array.class
	WalkingTracker/bin/classes/com/tracker/R$attr.class
	WalkingTracker/bin/classes/com/tracker/R$drawable.class
	WalkingTracker/bin/classes/com/tracker/R$id.class
	WalkingTracker/bin/classes/com/tracker/R$layout.class
	WalkingTracker/bin/classes/com/tracker/R$menu.class
	WalkingTracker/bin/classes/com/tracker/R$string.class
	WalkingTracker/bin/classes/com/tracker/R$style.class
	WalkingTracker/bin/classes/com/tracker/R$xml.class
	WalkingTracker/bin/classes/com/tracker/R.class
	WalkingTracker/bin/classes/com/tracker/Settings.class
	WalkingTracker/bin/classes/com/tracker/SimpleCanvas.class
	WalkingTracker/bin/classes/com/tracker/SplashActivity$1.class
	WalkingTracker/bin/classes/com/tracker/SplashActivity.class
	WalkingTracker/bin/classes/com/tracker/WalkCanvas.class
	WalkingTracker/bin/classes/com/tracker/WalkMapV2.class
	WalkingTracker/bin/classes/com/tracker/WalkViewerV2.class
	WalkingTracker/gen/com/tracker/R.java
	WalkingTracker/project.properties
	WalkingTracker/src/com/tracker/Database.java
	WalkingTracker/src/com/tracker/Log.java
	WalkingTracker/src/com/tracker/LogView.java
	WalkingTracker/src/com/tracker/Settings.java
	WalkingTracker/src/com/tracker/SimpleCanvas.java
	WalkingTracker/src/com/tracker/SplashActivity.java
	WalkingTracker/src/com/tracker/WalkCanvas.java
	WalkingTracker/src/com/tracker/WalkMapV2.java