fixed profile view
Merge branch 'master' into devel