dialog plus markers
Merge branch 'master' into ibbe
IBBE
Conflicts:
	GameOfNature/res/drawable-hdpi/dialog.png