player test
Merge branch 'master' into jisoon

Conflicts:
	src/main/webapp/WEB-INF/cfg/jdbc.properties
	src/main/webapp/WEB-INF/views/view/play.jsp
find result update
Merge branch 'master' of https://github.com/bdult/storyfarm into Unho
jpg size update
Merge branch 'Unho'
동영상 플레이 수정 중
Merge branch 'pub' into jisoon

Conflicts:
	src/main/webapp/WEB-INF/views/view/play.jsp
Merge branch 'jisoon'

Conflicts:
	src/main/webapp/WEB-INF/views/includes/header.jsp
	src/main/webapp/assets/images/content/hangul_Timg.jpg
	src/main/webapp/assets/images/content/thum.jpg
ch
merge
Update sub&play page