Fixed bug with current user in header.
Merge remote-tracking branch 'origin/master'