Merge branch 'release/0.2.5' into develop
Fix django relations
Update version
Merge branch 'release/0.2.6'