Last stage before branching
Merge branch 'master' of https://github.com/nair13/Molurus

The last stage before remodelling in Django