마이바티스 설정 servlet-context  안으로
Merge branch 'master' into jisoon

Conflicts:
	src/main/webapp/WEB-INF/web.xml
타일즈 에러 수정
Merge branch 'soulmatt' of https://github.com/this88mild7/bsg_pcms into soulmatt