ignore possible expanded zip install release for inspection
Merge branch 'master' from upstream project https://github.com/akeeba/fof
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
Merge branch 'development' of https://github.com/akeeba/fof into development

# By Nicholas K. Dionysopoulos (31) and others
# Via Nicholas K. Dionysopoulos (8) and Daniele Rosario (2)
* 'development' of https://github.com/akeeba/fof: (45 commits)
  Woops! The default "joomla" renderer didn't render the labels.
  Um, wait, what?
  Applied new filters to default behavior
  Fixes gh-21 You can now map magic fields in fof.xml
  Review code style in view/csv.php
  Moved dispatcher behavior for the sake of clarity
  Added new way of filtering. Still to implement various options to use them
  gh-30 WTF am I supposed to be doing here?
  gh-30 Frontend/backend/cli checks using the platform abstraction layer
  gh-30 ACL checks using the platform abstraction layer
  gh-30 Running plugins using the platform abstraction layer
  Stub of the behavior model feature
  Stub of a demo behavior
  gh-30 Admin authorisation using the platform abstraction layer
  gh-30 Admin authorisation using the platform abstraction layer
  Added stub of model behaviors
  gh-30 Replacing the language loading with call to the platform abstraction layer
  gh-30 Improving the usefulness of fetching the template override directory
  gh-30 Taking out the trash
  gh-30 Replacing hardcoded view template path detection with the a call to the platform abstraction layer
  ...

Conflicts:
	fof/controller/controller.php
Merge branch 'development' of https://github.com/akeeba/fof into development
Merge branch 'development' of https://github.com/akeeba/fof into development
Merge branch 'development' of https://github.com/akeeba/fof into development

# By Javier
# Via Javier (1) and Nicholas K. Dionysopoulos (1)
* 'development' of https://github.com/akeeba/fof:
  Code style check in form field list
Merge branch 'development' of https://github.com/akeeba/fof into development
add a third parameter to fof/View::setModel to avoid collision in
_models array
(see discussion here :
https://groups.google.com/forum/?hl=en&fromgroups=#!topic/frameworkonframework/EpHJS5o3jhU)
remove generated html doc relic from old docbook initial doc
Merge pull request #47 from nonnenmacher/development

add a third parameter in view setModel to avoid collision in view->_models array