temp update
Merge branch 'temp_hyouk'

Conflicts:
	Kiznic/bin/Kiznic.apk
	Kiznic/bin/classes.dex
	Kiznic/bin/classes/com/hhh/kiznic/MainActivity$1.class
	Kiznic/bin/classes/com/hhh/kiznic/MainActivity$2.class
	Kiznic/bin/classes/com/hhh/kiznic/MainActivity$3.class
	Kiznic/bin/classes/com/hhh/kiznic/MainActivity$4.class
	Kiznic/bin/classes/com/hhh/kiznic/MainActivity$5.class
	Kiznic/bin/classes/com/hhh/kiznic/MainActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/R$drawable.class
	Kiznic/bin/classes/com/hhh/kiznic/R$id.class
	Kiznic/bin/classes/com/hhh/kiznic/R$layout.class
	Kiznic/bin/classes/com/hhh/kiznic/R$menu.class
	Kiznic/bin/classes/com/hhh/kiznic/R$string.class
	Kiznic/bin/classes/com/hhh/kiznic/R$style.class
	Kiznic/bin/classes/com/hhh/kiznic/card/MainRecommendCard.class
	Kiznic/bin/classes/com/hhh/kiznic/card/MainWeatherCard.class
	Kiznic/bin/classes/com/hhh/kiznic/util/Util.class
	Kiznic/bin/resources.ap_
	Kiznic/gen/com/hhh/kiznic/R.java