brian: added mort calc and trip calc functionalities
Merge branch 'dev' of https://github.com/khalua/calcit into dev