renaming topics works
renaming topics works
Merge branch 'master' into jawwad-test-topics
Fix Django older version error
Merge branch 'master' into jawwad-test-topics
Merge pull request #64 from CombustibleLemons/devon-milestone-4B

Commented out deprecated code, cleaned controllers.js in general
Merge pull request #65 from CombustibleLemons/jawwad-test-topics

Jawwad test topics
more acceptance tests, some stuff for implemented
Merge branch 'master' into devon-milestone-4B
merge successful, fixed some formatting