changed nothing
Merge commit '32b1329462a833dff3da3840107f69ec178cd184' into vani's_branch
Merge commit '324f874ca6adc82b92753523b62d42ec6212d5c1' into vani's_branch
Merge commit '49639ed344650950ecaa7e4dced3e88e71f10f6c' into vani's_branch
edited parseTaskEndTime