Merge branch 't1' into t3

Conflicts:
	apps/hello/admin.py
	apps/hello/models.py
Merge branch 't1' into t3
ticket:3 flake8
Merge branch 't3'

Conflicts:
	apps/hello/admin.py
	apps/hello/models.py