Merged in changes

Allowed Player to edit profile, added back in testing player profiles, reformarted Web.py to spaces from tab