메장메인뷰 + 다음지
메장메인뷰 + 다음지도
Commit & sync
Merge branch 'master' of https://github.com/apptool/otgri

Conflicts:
	Android/Otgri/res/drawable-xhdpi/btn_myroom_push_n.png
	Android/Otgri/res/drawable-xhdpi/text_main_nearitem.png
	Android/Otgri/res/drawable-xhdpi/text_myroom_seller.png
	IOS/Otgri/.DS_Store
	IOS/Otgri/Otgri.xcodeproj/project.pbxproj
	IOS/Otgri/Otgri/.DS_Store
	IOS/Otgri/Otgri/10월1일/i-icon14.png
	IOS/Otgri/Otgri/10월1일/imgbox.png
	IOS/Otgri/Otgri/RootViewController.xib
sync