[FIX] Object actions and batch actions now takes into account credentials parameters
Merge branch 'master' into fix-issue_531
Minor changes
Manage merge configuration
Minor change: null fields definition in builder is not allowed anymore
Refactoring: checkCredentials now handle checkCredentials and checkCredentialsWithObject
Patch: default message for delete error
Add pk_requirement option to make admingenerator routes less greedy
Add pk requirement to skeleton
Add docs for new option
Merge pull request #532 from sescandell/fix-issue_531

[FIX] Credentials for object|Batch actions and Generator merge
Update to master, resolve conficts
Merge pull request #537 from symfony2admingenerator/routing-actions-req

Add pk_requirement option to make admingenerator routes less greedy