mypage
profile image 불러오기
profile 관리
Merge branch 'hong2'

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$1.class
	Kiznic/bin/classes/com/hhh/kiznic/MainFragmentActivity$DummySectionFragment.class
	Kiznic/bin/classes/com/hhh/kiznic/MainFragmentActivity$SectionsPagerAdapter.class
	Kiznic/bin/classes/com/hhh/kiznic/MainFragmentActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$1.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$10.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$11.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$12.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$13.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$2.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$3.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$4.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$5.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$6.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$7.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$8.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity$9.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageActivity.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageLoginDialog.class
	Kiznic/bin/classes/com/hhh/kiznic/MyPageNicknameDialog.class
	Kiznic/bin/classes/com/hhh/kiznic/NMapViewerResourceProvider.class
	Kiznic/bin/classes/com/hhh/kiznic/OneStopActivity.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/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/classes/com/hhh/kiznic/util/Util.class
	Kiznic/bin/resources.ap_
	Kiznic/gen/com/hhh/kiznic/R.java