* Support softmax return in softmax_with_cross_entropy

* Add test for return_softmax=False

test=develop