updated main files to new github master version

(0) -30 -10 -1 +1 tip

mercurial