First checkpoint in refactoring the website agent to accept merge mode
Added merge mode
Added a note about merge mode
Added changes by @knu
Merge pull request #650 from chriseidhof/website-agent-merge-events

Make the website agent support merge events