Update scrum doc
Merge remote-tracking branch 'origin/master' into Huys_Branch
Updated scum doc
Merge remote-tracking branch 'origin/master' into Huys_Branch