Merge remote-tracking branch 'origin/autumn'
Merge branch 'master' of ssh://github.com/Autumn/cammap