updated Inspect docstring
fixed tests structure for django 1.7
Merge branch 'develop'