Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Browser into jellybean2

Conflicts:
	res/values-cs/strings.xml
	res/values-el/strings.xml
	res/values-nl/arrays.xml
	res/xml-sw600dp/lab_preferences.xml
	res/xml/lab_preferences.xml

'Updating to get rid of some glitches'