Ajax upload update
Merge pull request #920 from sexnothing/develop

Ajax upload update