several more fixes after merge
Merge branch 'master' of git://github.com/Kunstmaan/KunstmaanGeneratorBundle

* 'master' of git://github.com/Kunstmaan/KunstmaanGeneratorBundle:
  merge fix