Merge branch 'cal' of github.com:g0v/kuansim-frontend into cal