Fixed Add Time Bug
Merge branch 'patrikmerge' into dev