local data admin
mypage ux,ui
main page profile click -> mypage
weather fine dust circle

issue----------------------------------
fine dust error text
main text
Merge branch 'hong3'

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.class
	Kiznic/bin/classes/com/hhh/kiznic/MainFragmentActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageLoginDialog.class
	Kiznic/bin/classes/com/hhh/kiznic/OneStopActivity.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/SearchActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/SearchcategoryDialog.class
	Kiznic/bin/classes/com/hhh/kiznic/bluetooth/DeviceListActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/card/DetailListCard.class
	Kiznic/bin/classes/com/hhh/kiznic/card/DetailnevigationlistCard.class
	Kiznic/bin/classes/com/hhh/kiznic/card/MainRecommendCard.class
	Kiznic/bin/classes/com/hhh/kiznic/card/MainRecommendCarditemCard.class
	Kiznic/bin/classes/com/hhh/kiznic/card/MainWeatherCard.class
	Kiznic/bin/classes/com/hhh/kiznic/connection/GetRecommendPicnicSimpleInfo.class
	Kiznic/bin/resources.ap_
	Kiznic/gen/com/hhh/kiznic/R.java
	Kiznic/src/com/hhh/kiznic/MainActivity.java