Display should now show a message stating whether or not the GPS has a lock
Merge changes