fixes #2239 API v2 CRUD for locations and organizations and added nested loc/org