main page layouting done
main page content complete
Merge branch 'master' into gh-pages