Merged updates from umonya\DjangoWebsite