guideBbs
Merge branch 'master' of https://github.com/mojjong/8bittravel

Conflicts:
	src/main/java/org/yo/travelbbs/mapper/TravelbbsMapper.java
	src/main/java/org/yo/travelbbs/mapper/TravelbbsMapper.xml
	src/main/java/org/yo/travelbbs/service/TravelbbsService.java
	src/main/java/org/yo/travelbbs/vo/TravelbbsVO.java
	src/main/webapp/WEB-INF/spring/root-context.xml
	src/main/webapp/WEB-INF/views/bbs/travelbbs/list.jsp
	src/main/webapp/resources/inc/bootstrap/css/bootstrap.min.css
	src/main/webapp/resources/styles/themes/default/stylesheet.css
	src/test/java/org/yo/travelbbs/mapper/TravelbbsMapperTest.java
	target/classes/org/yo/travelbbs/mapper/TravelbbsMapper.xml
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/m2e-wtp/web-resources/META-INF/maven/org.yo/web/pom.properties
no message