Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp