code refactoring, changed permissions on profile fields
Merge remote-tracking branch 'origin/master'