hotfix for comments recyling bug
Merge branch 'development' into feature/official-material

Conflicts:
	app/build.gradle