Fixed favicon url
A few changes on serving statics files
A few changes on serving static files
fixed merge conflict