ignore possible expanded zip install release for inspection
Merge branch 'master' from upstream project https://github.com/akeeba/fof
gh-19 first draft of HAL implementation (in the JSON format only)
gh-19 Docblocks and fixes for silly bugs
gh-19 Add support for HAL in FOFViewJson
gh-19 Correct MIME encoding for HAL+JSON output format and support for enabling hypermedia using fof.xml and $config variables
Fixes gh-20 The return value of FOFController::onBeforeApplySave() is ignored
gh-19 Oops...
Merge branch 'master' of https://github.com/akeeba/fof

# By Nicholas K. Dionysopoulos
# Via Nicholas K. Dionysopoulos
* 'master' of https://github.com/akeeba/fof:
  Updating .gitignore
  Closes #17 Load per-format controllers, e.g. when format=json load from file controllername.json.php

Conflicts:
	.gitignore
add generated html doc from docbook source
pull request to correct #20 proposition
Added Asset id checks on actions
Fixed asset naming issue
Fixed Fatal error
Merge pull request #25 from Skullbock/development

gh-23 Asset ID support
Closes gh-25 Refactored the asset key assignment
Closes gh-23 Adding rules field, used for per-item ACL settings
Cannot save forms because the id is empty
Merge branch 'feature/hateoas' into development
Fixed wrong config provider key