Improoved

improoved gps location firs from gps is enabed and then from network if
is enabled