Updated use of calculator in HomeController
Converted dates to joda time
Merge branch 'master' of https://github.com/jcourtois/rnr