preparation for django 1.7
Update to version v0.1.5
Merge branch 'release/v0.1.5'