username not displaying after registration
Merge remote-tracking branch 'upstream/master'