added deconstructible decorator to storage for django 1.7 migration support
Merge branches 'django17' and 'master'