fix argument passing

Conflicts:
	python/caffe/imagenet/wrapper.py
added imagenet prediction on numpy arrays