[FIXED]context
Merge branch 'master' of https://github.com/blstream/myHoard_Java2

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