Merge branch 'dev' into contao-3
added contao/core in require-dev with dev-master and bumped core
version dependency (conflicting with 3.0).
Merge branch 'dev' into contao3
Updated branch aliasing.
Merge branch 'dev' into contao3
Merge branch 'dev' into contao3
Merge branch 'dev' into contao3
Merge branch 'dev' into contao3
Merge branch 'dev' into contao3

Conflicts:
	composer.json
Merge branch contao3 of git://github.com/MetaModels/DC_General into contao3
Correct the accesskey for the "save and close" button.
Handle object type properties when show record details.
Replace tab indention with spaces.
Merge pull request #79 from tristanlins/contao3

Fix access key and handle object type properties in details view.
Quick fix: handle exceptions in updateModelFromPOST().
Method GeneralCallbackDefault::groupCallback expect an model object, not an array.
Method GeneralCallbackDefault::groupCallback expect an model object, not an array.
Fix custom parent field in mode 4.

If the parent reference field is not named pid,
the name must read from getParentChildCondition().
Fix custom parent field in mode 4.

If the parent reference field is not named pid,
the name must read from getParentChildCondition().
Merge pull request #82 from tristanlins/hotfix/group-callback-model

Method GeneralCallbackDefault::groupCallback expects a model and not an array.