Dialog redesigning
Merge branch 'master' of https://github.com/jsuppe/sprite-light

Conflicts:
	.gitignore
	sprite-light.pro.user