minor change
Merge branch 'master' into development_l
adds can can but breaks friending proces
Merge branch 'master' into development_l