Must provide model name during admin generator task, use Entity or Model folder depending of used ORM
Asking for model name in admin generator tasks
Adding more indication about 'model-name' option
Renaming a wrong variable name
Adding Document model folder for Doctrine ORM
Changed call of isGranted

This didn't work for me as it was.
The function header for isGranted is as follows:

    final public function isGranted($attributes, $object = null)

It was called with $attributes = array(Expression, ModelClass) and $object was always = null

This didn't work, as the object was always null and always returned true.
Merge pull request #319 from kufi/patch-1

Changed call of isGranted
Changed isGranted

Get the object from the form, so the expression can also check for permissions through ACL.
The view CommonAdmin/EditTemplate/fieldset.php.twig already does the same thing as the updated code (line {{ echo_if_granted(builder.Columns[field].credentials, builder.ModelClass) }}).
Merge pull request #320 from kufi/patch-2

Changed isGranted in EditType
Merge pull request #321 from eymengunay/master

Show Builder Support
Nested merge
Merge pull request #324 from symfony2admingenerator/nested-merge

Nested list update merge
Add google-prettify and start new documentation
Moved files from resources to Resources
Removed duplicated js
fixed js issue
Add tooltip and fix js
Add tooltip and fix js
Merge pull request #69 from jpetitcolas/feat-modelname

Asking for model name during generation process
Merge pull request #2 from symfony2admingenerator/master

Merge