use rabl for json
fi merge conflicts
fix merge