fixed language bug
removed nested ifs
Merge branch 'issue14713-newdashboard' of git://github.com/Kunstmaan/KunstmaanAdminBundle into issue14713-newdashboard