master-commit
test-rebase
master-far
rebase branch
Merge remote-tracking branch 'origin/master' into test-rebase

Conflicts:
	src/main/java/my/ilya/kind/action/KindDemo.java
master flamaster
test-rebase
remote branch
Merge remote-tracking branch 'origin/test-rebase' into test-rebase-1