Updated campaign builder layout slightly, fixed more language formats
Merge branch 'master' of bitbucket.org:allyde/mautic
Naming conflict resolved
Merge branch 'master' of bitbucket.org:allyde/mautic