merged to master
No acceptance test this Friday
final changes on slides before presentation