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

Conflicts:
	filling_db/init_db.py
user_by_id route done, added template
Merge remote-tracking branch 'origin/web' into web

Conflicts:
	filling_db/init_db.py
templates: base, base_user_by_id, base_userlist
fix head in base
add static
fix ugly name
add truncate and fix get_word in init_db
add last fight in user_id
fix  errors PyCharm autorefactoring
add last fights
rus language in templates
add character_detail
refactoring
finish character detail
fix NoneType error in template
Merge branch 'web'

Conflicts:
	filling_db/init_db.py