после показа
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/editor/controllers/patern_e_C.java