TomTroppmann b9f961cfb7 Merge branch 'updateInProgress' into XChart-integration 2 rokov pred
..
controller b9f961cfb7 Merge branch 'updateInProgress' into XChart-integration 2 rokov pred
model b9f961cfb7 Merge branch 'updateInProgress' into XChart-integration 2 rokov pred
view b9f961cfb7 Merge branch 'updateInProgress' into XChart-integration 2 rokov pred