test
Merge branch 'konik' into dev
Merge branch 'dev'
Merge branch 'master' of github.com:radimklaska/testing_repo_for_jenkins

Conflicts:
	README