가이드쪽 업로드, view단.
Merge branch 'master' of https://github.com/mojjong/8bittravel

Conflicts:
	src/main/java/org/yo/guidebbs/mapper/GuideBbsMapper.xml
	target/classes/org/yo/guidebbs/mapper/GuideBbsMapper.xml
	target/m2e-wtp/web-resources/META-INF/maven/org.yo/web/pom.properties