Add merge action, to handle hooking merges
Choose template for preview based on fork's parent

Looks up the parent ID of the current fork, and sets up a query based on
that post before loading the template. Otherwise, all previews of forks
use the single.php template, which isn't correct for forks of pages or
other special cases.
Admin body class on forks list table view.
Reminified css.
improve compatability with WP 3.6
refactoring diff.php to use mergely.js. adding mergely code to js/ (sans its examples and docs; just the source)
start of three-way diff for mergely
compare/diff functionality, resolve failing tests
Lowercases capital 'H' in 'When' in inline documentation for delete_post() because grammar.
Merge pull request #63 from yurivictor/master

Grammars
fixing diff.php
Merge branch 'dev-3.6'
Merge pull request #64 from alleyinteractive/master

WP 3.6 Compatability
Merge pull request #59 from goldenapples/template-selection

"View fork" preview should try to use template redirect intelligently
Merge branch 'master' of https://github.com/PabloVallejo/post-forking into PabloVallejo-master

Conflicts:
	includes/merge.php
bump tests to 3.5 minimum
better tooling
dat 5.3 back-compat, props @nacin
[i18n]> updated pot file using WordPress makepot.php
Merge pull request #69 from fxbenard/master

[i18n]> updated pot file using WordPress makepot.php