blast_tpl_OneRightUpLettersTemplate bugFix
conflict resolv
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into test
Merge branch 'dev' into test
Revert "cal_Tasks bugFix - Права за достъп до сингъла на задачите"

This reverts commit 8a712b8aa78d93dd538ae41b958f107ff5e693bf.
Merge remote-tracking branch 'origin/test' into dev