Changed references of user to userInfo in Map and Puzzle activity.

NOT TESTED
Starting to debug the conversion from User to UserInfo