Changes made by Keith Ellington (kellington@trihydro.com).
updated camera code to work with Iphone
Merge branch 'master' of https://github.com/sludtke/PhotoUploader.git

Conflicts:
	Photo Uploader App/js/index.js
Changes made by Keith Ellington (kellington@trihydro.com).

updates after merge with server