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

Conflicts:
	src/main/java/core/pages/ManageHostsPage.java
Merge branch 'master' of C:\Infotex with conflicts.