Added option string constants at ANN components. Also solved bug at dropout
Merge branch 'master' into fnnlm