a
b
Merge branch 'master' into branch1

Conflicts:
	Dialog.java
Merge branch 'branch1' into branch2