date and timepicker added
Merge branch 'master' of github.com:stefaneugster/wakaTimeline