fixes #2841 - locations CRUD
Merge pull request #2 from tstrachota/locations

fixes #2841 - locations CRUD
fixes #2906 - test are broken on 1.8