adding some topic layout flexibility
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
Merge pull request #2526 from awesomerobot/master

adding some topic layout flexibility