updt reports
Merge branch 'master' of https://github.com/Faustyachka/Zephyrus

Conflicts:
	WebContent/WEB-INF/web.xml