jquery-upload implementation
fix conflicts