Merging to master

Improved features
Integration progression
Added avatar upload
Bug fixes