added some tests for topic show page
Merge branch 'master' of github.com:shawnbro/quick_shark into fixmovingdivs
fixed merge conflicts