Merge branch 'master' of https://github.com/mj201/testing-location into Play-999-my-ticket
2nd round of changes
3rd round of changes
added tests