Creates Django class and adds apache dependencies
Fix merge conflicts
Merge in django branch