Update short names
Change to git repos
Merge branch 'master' of https://github.com/eheien/cig_backend