Some smoke
Merge branch 'master' of github.com:ninjadev/en

Conflicts:
	src/DesertLayer.js