ca bugfix
ca templates
Merge branch 'master' of https://github.com/enjayes/logistikapp.git