Debuging problems with avatar
Reverted composer to version 1.0.1
Merge remote-tracking branch 'origin/dev'