Some changes

Conflicts:

	core/res/res/values/dimens.xml