Alexander 1st commit

Alexander 1st commit
Merge remote-tracking branch 'origin/master'

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