modify at home
Merge branch 'master' of https://github.com/dengy/CountDown

Conflicts:
	src/android/first/countdown/CountDownAppWidgetProvider.java
	src/android/first/countdown/CountDownEdit.java
	src/android/first/countdown/WidgetConfigure.java