initial try to merge with jquery upload
solve conflicts