renamed modules
added settings.py
added settings.py
renamed modules
Merge branch 'develop'

Conflicts:
	examples/most/main/urls.py