triggerEvent can return a default value
canEdit and canRead now have a hook to allow plugins to extend ACLS
Merge branch 'master' into acl-hooks
Adding no-content message for search and empty feed. Closes #212.
Merge branch 'master' into no-content

Conflicts:
	templates/default/pages/home.tpl.php
Merge branch 'master' into acl-hooks
Introducing new home for bookmarklet
Allow raw body posting depending on content-type (lets you make calls other than application/x-www-form-urlencoded)
Green theme admin tweak
getDefaultContentTypes now returns an empty array if none are defined
Show nav in share via bookmarklet, closes #380.
Change
Merge pull request #381 from mapkyca/show-nav-share

Show nav in share via bookmarklet
Content can now have a published date set via API
Moving event definitions out of User construction
Fixing webfinger URLs
Ensuring rels are an array
config.ini has prominence
Adding a new homepage URL route.

cc @timmmmyboy - this may fix the subdirectory problem you were having.
Known now supports JSON configuration files.