[#312] New error message when adding empty primary location
[#312] Updated error message
[#312] Code cleanup
Merge pull request #517 from akvo/feature/312_locations_admin

Code checked and OK