Begining to integrate with django paypal
Removed unused files
Solved conflicts - nothing changed
Fixed bugs of cinflicts