Removed the getClient() method from WebPage.java
Merge remote-tracking branch 'origin/master'
Removed the SiteInformationManager.class conflict files