FIX: Fixed non-merged files
Merge branch 'di_bootstrapping' of github.com:punktDe/pt_extbase into di_bootstrapping