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

Make the website agent support merge events
update Rails to 4.1.8
Merge pull request #659 from cantino/update_rails

update Rails to 4.1.8