sprint 6 stories time estimation + fixed tables captions
Merge branch 'master' of https://github.com/dohnto/CDP