Merge branch 'release-day028'
Merge branch 'release-day030'
Merge branch 'master' of /media/SYSRESC/daily into dev
delete test.txt
Merge branch 'dev' of https://github.com/jijoel/daily into dev
update kata template