Merge branch 'master' of https://github.com/YOLOcs361/Project

Conflicts:
	war/WEB-INF/web.xml
Merge branch 'master' of https://github.com/YOLOcs361/Project