Change 'desc' to 'bei', 'avatar' to 'image'
Merge branch 'master' into openshift