rebased wrt to latest dev
added openmp to lrn_layer