Deleted useless comment.
Settings and directory location modified to allow showing of profile pictures that are already uploaded.
Merge remote-tracking branch 'origin/master'