offline
Merge branch 'master' of github.com:shiftplanning/canjs