add last update into app layout
conflict fix
Merge branch 'master' of https://github.com/lovelease/helloandroid.git

Conflicts:
	gen/com/example/helloandroid/R.java
	res/layout/activity_wfmain.xml
	res/values/strings.xml
	src/com/example/helloandroid/weatherforecast/activity/WFMainActivity.java
	src/com/example/helloandroid/weatherforecast/consts/PublicConsts.java
	src/com/example/helloandroid/weatherforecast/utils/Utility.java
	src/com/example/helloandroid/weatherforecast/widget/WeatherWidget.java