sync
Merge branch 'master' of git@github.com:Faustyachka/Zephyrus.git

Conflicts:
	WebContent/WEB-INF/web.xml