tag name attribute order changed
Merge branch 'develop'
Merge branch 'develop'
delete defoult value
disable karma watching
Karma watching disabled

cessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.