little things on templates
Merge branch 'develop' of https://github.com/mastodonte/bootstrapSymfonyThemeAdmin into develop
Merge pull request #1 from brunopastor/develop

hotfix: hidden list actions on doctrine list
add number or results to _list template
Merge commit 'ba21081' into develop
Merge branch 'develop' of github.com:Sunsetlabs/bootstrapAdminThemePlugin into develop

Conflicts:
	data/generator/sfDoctrineModule/bootstrap/template/templates/_form_field.php