Merge branch 'develop' into enroll-check
Merge branch 'develop' into enroll-check
Merge branch 'develop' into enroll-check
Merge branch 'develop' into enroll-check
Merge branch 'FileLoadIssue' into enroll-check
Merge branch 'develop' into hotfixes
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 branch 'develop' into hotfixes
Ending games properly
'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
Fix to show relationship in edit page (took 2h!)

-Some minor syntax and prompt fix too
Small fixes
Edit relation for user makes no sense
see below;

- Say a different thing if editing user
- Do not ask for relation if editing the main user