Add new custom locale
Merge branch 'master' into develop

because we want the custom locales to develop too
Update deploy script and few custom error pages