lock composer dev versions
Merge master into develop
revise expiring opportunities