merge ucfcdl gh-pages into havok2905 gh-pages