modified:   easycms_project/settings.py
	modified:   easycms_project/urls.py
Merge branch 'master' of https://github.com/dspichkin/easycms_project