Fix QuerySet._update_qs for resolving conflicts in parameters
Add simple mechanism for manual "join"
Joins with multiple fields
Add Join.get_queryset() and some refactoring
Fix version
Merge branch 'develop'