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

Conflicts:
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-pl/strings.xml
	res/values-pt/strings.xml
	res/values-ru/strings.xml
	res/values/arrays.xml
	res/values/config.xml
	res/values/strings.xml
	res/xml/video_preferences.xml
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/Util.java
	src/com/android/camera/VideoController.java
	src/com/android/camera/VideoModule.java

'Add HDR stuff in'