main page layout
added favicon
removed unused local + re-activated part of test
Merge remote-tracking branch 'upstream/master'