before final client meeting
ok conflict fixed
Merge branch 'warren'