Merge branch 'master' of github.com:vaadin/gwt-site into jd_click_enhancement

Conflicts:
	src/main/java/com/google/gwt/site/webapp/client/GWTProjectEntryPoint.java