should fix #21
fixes #22
fixes #20
Merge branch 'development' into feature/official-material

Conflicts:
	app/src/main/res/layout/comments_header.xml
	app/src/main/res/layout/view_story_link.xml