merged dev and gh-pages into dev