Merge remote-tracking branch 'upstream/user' into user
Avatar upload ie bug fixed
Install.html rm
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #638 from sexnothing/user

Avatar upload ie bug fixed