smaller main part
Merge branch 'master' of https://github.com/yoannmoranville/speed-pyramid
although all tests where green a bug was reported (match date tomorrow was possible) so we just move to joda time its better anyway