new scemedb
Merge remote-tracking branch 'origin/master' into web

Conflicts:
	filling_db/init_db.py
Merge remote-tracking branch 'origin/web' into web

Conflicts:
	filling_db/init_db.py
templates: base, base_user_by_id, base_userlist