Changed Bugfix Branch Workflow Doc

Change the bugfix branch workflow doc to say that
changed should always be merged into both develop
and master, so that both have the correct history.