Welcome email content can now be edited from admin interface
Fixed map default locations, enabled 3 different ways for displaying the real name of users
Uploading avatar is now part of the edit profile form
Merge branch 'feature/bug_fixes' into develop