these too

Conflicts:

	res/drawable-xhdpi/ic_launcher_wallpaper.png