Merge pull request #648 from montabou/master

add class comment to DefaultController/Type for fixing coding standard
Fix: restrict bootstrap component to a version inferior to 3.0
Merge pull request #649 from K-Phoen/fix-bootstrap-component-version

Fix: restrict bootstrap component to a version inferior to 3.0
Merge pull request #651 from montabou/master

fix embed type form
Fixed preg_match

We should be sure that the checked option ends with Type. 
Without that such configuration in *generator.yml:
```yml
page:
        label: ""
        formType: \NS\AdminBundle\Form\Type\BasePage\EditType
        addFormOptions:
          data_class: NS\CMSBundle\Model\Page\TeaTypePage
```
will generate such code:
```php
$formOptions = $this->getFormOption('page', new required' => false,  'data_class' => 'NS\CMSBundle\Model\Page\TeaType());
```
and of course fatal error.
Merge pull request #653 from auss/patch-1

Fixed preg_match
Fix path to html5shiv library
Merge pull request #655 from sescandell/fix-html5shiv

Fix path to html5shiv library
Update generator.yml

Fix for propel generator to automatically add model name
Allow generic actions to use ACL 

Fixes a problem if f.e. there are credentials on the show action in the form of hasPermission(object, "VIEW"). If this is then used in the edit view an error is thrown because the object isn't passed.
own builder has to be a service in case of extending default builder
adds refence to `Creating Menus as Services`
Merge pull request #659 from kufi/patch-5

Allow generic actions to use ACL
Merge pull request #660 from soeren-helbig/master

updates doc for costumizing the navbar menu
updates doc to overwrite menu block

updates doc, to explain how to overwrite menu-block
Merge pull request #661 from soeren-helbig/master

updates doc to overwrite menu block
Fix warning when using config:dump-reference on admingenerator_generator
Revert #659
Merge pull request #662 from rolebi/master

Fix warning when using config:dump-reference on admingenerator_generator
Merge pull request #658 from ksn135/master

Update generator.yml