add current user to header
Merge remote-tracking branch 'origin/master'
fix merge