up
Merge branch 'master' of https://github.com/dcsoftgit/Slick

Conflicts:
	res/bg.pdn