Colin Powell 56039e8aa5 Fix pull conflicts 7 mesiacov pred
..
files 56039e8aa5 Fix pull conflicts 7 mesiacov pred
tasks 56039e8aa5 Fix pull conflicts 7 mesiacov pred
templates 56039e8aa5 Fix pull conflicts 7 mesiacov pred