Almost fixed id problems
Merge branch 'master' of https://github.com/bennyty/speedGIT.git
Very nearly fixed id issues