Merge branch 'master' of https://github.com/MathiasVP/Flashlight

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/apprestige/flashlight/CameraActivity.java
Merge branch 'master' of https://github.com/MathiasVP/Flashlight

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml