Merge branch 'master' into 170-improve-documentation

* master:
  update timeplan week 13
  updated timetracking
  added new detail view ss
  fix bug
  transcribe retro 6
  Added meeting minutes

# Conflicts:
#	Documentation/src/03_project-documentation/05_meeting-minutes.tex