- change spring-servlet to applicationContext
Merge branch 'develop' of https://github.com/tncgroup/stsrepo into develop

# By Thanasit
# Via Thanasit
* 'develop' of https://github.com/tncgroup/stsrepo:
  no message
  .

Conflicts:
	TNC/src/main/webapp/WEB-INF/web.xml