Merge branch 'master' of https://github.com/codeoffs/AppSite.git
Revert "GiftsSite"

This reverts commit 67240c1db5148cd39ac6f03db0211d8103124bee.
Merge branch 'master' of https://github.com/codeoffs/AppSite

Conflicts:
	AppSite/AppSite/settings.py