improved settings file
Merge branch 'master' of github.com:OpenRing/site_n_blog

Conflicts:
	openring_site/settings.py