modified:   .gitignore
modified:   build.properties
modified:   gwt-files.xml
modified:   server/src/com/vaadin/server/ServletPortletHelper.java
modified:   server/src/com/vaadin/server/WebBrowser.java
modified:   build.properties
Merge remote-tracking branch 'remotes/origin/7.0.5.x'

Conflicts:
	gwt-files.xml
	server/src/com/vaadin/server/ServletPortletHelper.java