Initialize work
Merge branch 'master' into feature-split_views

Conflicts:
	Builder/Admin/BaseBuilder.php
Merge branch 'master' into feature-split_views
[WIP] Split generated views: work on list
Merge branch 'master' into feature-split_views
Merge branch 'master' into feature-split_views
fix the RoutingLoader to be compatible with PHP < 5.3.6
Merge branch 'master' into feature-split_views
improve the code of getFullBundleNameFromResource method.
foreach element seems to be useless
Merge branch 'master' into feature-split_views
[FIX] code formatting
fix missing parenthesis
Merge branch 'master' into feature-split_views
[FIX] code formatting for scrutinizer
Merge pull request #547 from bmelman/master

Added dutch translation
remove whitespace for scrutinizer
Merge pull request #544 from thibmonier/master

fix the RoutingLoader to be compatible with PHP < 5.3.6
Fix upload collection field
Update javascripts.html.twig

Fix for #549
Merge pull request #548 from skrobek/parent-sync

Fix upload collection field