discussion sidebar not done
Merge branch 'master' of github.com:opendream/journal_live