a
Merge branch 'master' of https://github.com/tyashki/bash-xml

Conflicts:
	EditorUi.java