Fix for CRM-12359
-- fixed for CRM-12333
CRM-12360

----------------------------------------
* CRM-12360: city field not available on address edit if language is NL
  http://issues.civicrm.org/jira/browse/CRM-12360
Merge pull request #447 from deepak-srivastava/crm43

Fix for CRM-12359
Merge pull request #454 from yashodha/CRM-12272

CRM-12272
Merge pull request #451 from dlobo/CRM-12360

CRM-12360
Merge pull request #449 from pradpnayak/CRM-12333

-- fixed for CRM-12333