implemented dropout in cnn layers
Merge branch 'master' of https://bitbucket.org/sudhargk/python-dnn

Conflicts:
	sample_config/CIFAR/CNN/nnet_spec.json
Merge branch 'master' of https://bitbucket.org/sudhargk/python-dnn