First commit: First FT and basic Django config
Merge remote-tracking branch 'upstream/master'