Import other routes from a controller directory (@Route annotation)
Merge pull request #330 from eymengunay/master

Object actions for show builder
New upload widget features:

* can have additional fields (for example: image + name + description)
* can mark field "nameable" (when new file is uploaded, it's normalized filename will be saved to this field)
* sortable behavior support (mark a field "sortable", item positions will be stored in that field)
Rewriting docs part 1
CollectionType documentation
Docs update:

* collection type
* entity picker type
* installation via composer
Docs update
Link fixes
Doc update
Doc update
Internationalization docs
Fix go-back link
 Import other routes from a controller directory (@Route annotation) - fix for empty folder
Merge pull request #329 from vitaliytv/master

Auto import annotation routes for admingenerator type
Refactoring upload widget, updated docs
Loosen the dependency on KnpMenuBundle
Merge pull request #332 from marekkalnik/master

Change dependency on KnpMenuBundle
Add branch alias for master
Merge pull request #333 from marekkalnik/master

Add branch alias for master
Merge pull request #4 from symfony2admingenerator/master

Merge