update formdesigner ref to cm (with master and develop merged in)