Touch Focus with continous Focus

 On branch bug966830_add_touch_focus_to_the_camera
 You are currently rebasing branch 'master' on '25d53d4'.
   (all conflicts fixed: run "git rebase --continue")
	modified:   js/app.js
	modified:   js/config/config.js
	modified:   js/controllers/camera.js
	modified:   js/controllers/viewfinder.js
	modified:   js/lib/camera.js
	modified:   js/views/focus-ring.js
	modified:   js/views/viewfinder.js
	new file:   style/focusring.css
	modified:   style/main.css