YH-177: Added label showing logged in user
Merge branch 'master' of https://github.com/yhteentoimivuuspalvelut/ytp-assets-common

Conflicts:
	resources/templates/head-styles-drupal.html
	resources/templates/head-styles.html