refactoring
Merge branch 'Alexei' of https://github.com/Kreisfahrer/Infotex into Alexei

Conflicts:
	src/main/java/core/pages/Header.java