Merge branch 'develop' into enroll-check
Coupling test for TTT
Merge branch 'develop' into TTTCommentCoupling
Merge branch 'develop' into enroll-check
Merge branch 'develop' into enroll-check
Merge branch 'develop' into TTTCommentCoupling
Merge branch 'develop' into enroll-check
Merge branch 'develop' into TTTCommentCoupling
Merge branch 'FileLoadIssue' into enroll-check
Resolved merge conflicts
File merge conflicts
Remove enroll's phone number
removes phone number from Enroll and agent proj.

Enroll changes in both VS and Java
Cleanup
Merge branch 'develop' into enroll-check
Merge conflict resolves
's not s
Lots, see below

- debugging the shadow memory of last person in next friend addition
- More robust handling of strings to be shown show on screen at both
Java and .Net, debugging empty values causing exceptions
- Debugging the UI
- Lots of fixes in style, spelling, etc
Fixes .net UI appearance
Nicer handling of editing friends and user

- removes some bugs which trapped conversation if no friends
- removes user himself as an option to edit friends