Reorganize topbar and correct it
Merge remote-tracking branch 'upstream/master'
Re-adding link to badge admin in menu + correct strict dispatcher name in logController + correct simpleautocomplete template after merge
Readd translation
Correct flash_message style for error message, danger now and not error anymore
Readd variable format to simpleautocomplete field form
Merge pull request #201 from maxailloud/master

Correct regression from incorrect merge