fixes

Conflicts:
	res/values/config.xml
fix green line in camera