add support for jpg and jpeg extensions
fixed upload asset error
Merge branch 'develop' of github.com:CartoDB/cartodb into develop