Merge remote-tracking branch 'remotes/origin/7.0.5.x' into 7.1
Merge remote-tracking branch 'remotes/origin/7.0.5.x' into 7.1
Changes to be committed:
    modified:   server/build.xml
    modified:   server/src/com/vaadin/server/BootstrapHandler.java
    modified:   server/src/com/vaadin/server/WebBrowser.java
    modified:   shared/src/com/vaadin/shared/VBrowserDetails.java

Untracked files:
    WebContent/VAADIN/cycle.js
    WebContent/VAADIN/json.js
    WebContent/VAADIN/json_parse.js
    WebContent/VAADIN/json_parse_state.js
Changes to be committed:
    new file:   WebContent/VAADIN/cycle.js
    new file:   WebContent/VAADIN/json.js
    new file:   WebContent/VAADIN/json_parse.js
    new file:   WebContent/VAADIN/json_parse_state.js
Merge branch '7.1.x'