Hotfix: Duplicate Notifications
Merge branch 'Hotfix'

Conflicts:
	com.yasoon.basecamp.xml