implementation - design - own-profile
Merge branch 'develop' of https://github.com/Zucka/girafAdmin into develop

Conflicts:
	source/desktop/assets/css/style.css