Optimized code a little
Temporary fix for south schema for upload_to error
Merge branch 'release-0.1'