Fix for multiple same headers when adding items
Merge branch 'develop'

Conflicts:
	gradle.properties