changes in mlp.py and cnn.py wrt dropout
Merge branch 'master' of https://bitbucket.org/sudhargk/python-dnn

Conflicts:
	src/utils/load_conf.py