First database variant with none of fields actually filled up
filled database
Merge branch 'master' of https://github.com/sergey-zakharov/EdPlatform

Conflicts:
	edplatform/db.sqlite3
	edplatform/edplatform/__pycache__/__init__.cpython-32.pyc
	edplatform/edplatform/__pycache__/settings.cpython-32.pyc
	edplatform/teacher_constructor/admin.py