Adapted for piVision task
merged

Merge branch 'master' of https://github.com/Oliver4242/dl-playground

Conflicts:
	python/TestingTheano/convolutional_mlp.py