remove unused fixMedia() method
move negotiation to the accept sub-objects
Merge branch 'refactor' into develop-2