JH: Moved to use LocationClient as recommended by documentation. Added marker for current location