Resolved conflicts by merging master to gh-pages.