add feature web
merge featureWeb to develop

Web' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add main.js feature
merge featureMain into develop
refine the main.js
merge release-1.0 to master