add camera functionality
camera not complete

camera not complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	PartsCatalog/project.properties

	PartsCatalog/src/com/google/zxing/integration/android/IntentIntegrator.java
	PartsCatalog/src/com/google/zxing/integration/android/IntentResult.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	PartsCatalog/.classpath
	PartsCatalog/bin/R.txt
	PartsCatalog/gen/ie/sal/partscatalog/R.java
	PartsCatalog/project.properties

	PartsCatalog/src/com/google/zxing/integration/android/IntentIntegrator.java
	PartsCatalog/src/com/google/zxing/integration/android/IntentResult.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	PartsCatalog/.classpath
	PartsCatalog/bin/R.txt
	PartsCatalog/gen/ie/sal/partscatalog/R.java
	PartsCatalog/project.properties
	PartsCatalog/src/com/google/zxing/integration/android/IntentIntegrator.java
	PartsCatalog/src/com/google/zxing/integration/android/IntentResult.java
Merge branch 'master' of https://github.com/iepaul/partscatalog

Conflicts:
	PartsCatalog/project.properties