Added lighttpd config file
Merge branch 'master' into dev