Added UserServer refactor
Added CommentServer refactor
Changed the title of some activities from the activity name to a reasonable title
Fixed some tests
Merged