Added currently logged in user in template
Merge branch 'ui-fixes'