fixing
Merge branch 'master' of https://github.com/Netoperek/django

Conflicts:
	src/mvp_landing/settings.pyc
	src/mvp_landing/urls.pyc