refactored school locator
Merge branch 'dev' of https://github.com/rickardz/SchemeApp into dev