Drugi milestone dev > merge u master