Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.
refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/core/pages/ManageHostsPage.java
refactoring
Merge remote-tracking branch 'origin/master' into Alexei