this might help
Merge branch 'dc43' of github.com:Droid-Concepts/DC-4.3_Manifest into dc43

Conflicts:
	default.xml