fix
Merge branch 'master' into week.start.thur
change client generation of week and iteration on a definition table