small fixes.
Merge branch 'master' of github.com:TeamDionysus/End-to-end-JS-Apps-Teamwork
Added user's avatar uploading.
Resolve conflicts