multiple baselayers
Merge branch 'tianyi_working' into gh-pages