Bug 845229 - added custom settings support

Conflicts:
	Makefile
Merge pull request #8345 from yurenju/settings.py-v1.0.1

Bug 845229 - added custom settings support