clean up
Merge branch 'lyman_branch' of github.com:eventchat/client into jason_branch
update userprofileviewcontroller