info 정리 완료 1
Merge branch 'master' of
https://github.com/JungHyun-Choi/showinfoculture.git

Conflicts:
	ShowInfoMobile/src/main/webapp/WEB-INF/views/m.showInfo.jsp

	11