from frigo ...
Merge branch 'master' of github.com:vincib/bookscanner-project-manager

Conflicts:
	www/s3_crop.php
	www/script.js
don't know what I'm committing... sorry
fixing config : removing it
adding configure camera script from Mark