Modified draw order to fix borders
Merge branch 'tileart'

Conflicts:
	app/assets/javascripts/client/config.js