restoring how dates/durations are calculated
Merge branch 'master' of github.com:web2project/web2project