Refactoring of git/svn import finished.

Now the import works without a working copy.
Merge branch 'git' into develop