merge branches to gh-pages
Merge conflicts
Update display info