put context path back to root
Merge branch 'master' of github.com:miltonio/milton2.git
Merge remote-tracking branch 'upstream/master'