Moving apps to the top-level.
Use plain settings and no big settings dict in settings file.

Conflicts:
	manage.py
	otree
	settings.py