integrated map calculator in conflicting classes.
Merge branch 'master' of https://github.com/galicae/tina.git