Merge pull request #1 from till/master

update to master of till
added listen options to nginx static template, mad consumer app default server
Merge pull request #154 from marsch/topics/default-server-for-static

Topics/default server for static