fix
Merge branch 'goshazvir'
content-elements
init calc
upd calc
upd calc
init calc_result
Merge branch 'master' into goshazvir
calc result