Support serializer and each_serializer in render json
merge controller fixes