Generated with nensskel, and copied some.
Merge branch 'master' of github.com:nens/raster-server

Conflicts:
	.gitignore