Changed dropout by dropout_factor
mend
Merge branch 'master' into fnnlm