Fixed userID problem and GPS problem
merge conflict fixed