Fix relative URLs for source
Merge branch 'master' into gh-pages
Update base app