Revert "undo test"

This reverts commit bc4462297571330128ef6629c8e46f4619f9fbf7.
Revert "test"

This reverts commit 74d0f2bc791a6e5c8d8fe19cda92ce849cf63a6b.
Merge branch 'master' of https://github.com/solomon71/sorl-thumbnail