Fixed language string for publish status badge in detail views
Added optional config file parameters_local.php that will force parameters for the local install overriding settings in the local config
Added an option to set a custom image upload location (for the editor's image uploads)
Merge branch 'master' of bitbucket.org:allyde/mautic