Barcode + picture stuff
Merge branch 'master' of github.com:naman34/optimus_device

Conflicts:
	platforms/ios/HelloWorld/config.xml