Merge pull request #447 from git-harry/sprint

Merged automatically by jenkins after successful gate test
Removed manage.py - no longer required.