uvp alg fix + calculations view
Merge branch 'master' of https://github.com/ReppDen/justatest2