Adds what appears to fix location attach for all possible states of location services
Merge branch 'master' of https://github.com/CMPUT301F14T05/CorgFu