메인뷰 ui완성, 지도뷰 적용
Merge branch 'master' of https://github.com/apptool/otgri

Conflicts:
	IOS/Otgri/.DS_Store