common styles for master & ics builds
merge order
Merge branch 'master' into multidirs

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'multidirs' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern