CHG: Apply new LayoutInheritance
CHG: apply metadata changes
Merge branch 'master' of
ssh://git@github.com/raptor2101/BWKConnector.Tablet.git

Conflicts:
	AndroidManifest.xml