Merge branch 'master' into new-url-formats
Fixed multi-site menu problem.
Merge branch 'master' into inline-editing

Conflicts:
	mokuji/components/cms/Sections.php
	mokuji/components/timeline/templates/global/__blogposts_entry.php
	mokuji/system/dependencies/Table.php
Fixed merge problem and missing translation.
Updated documentation.