Web Cam
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml