pick up resource formats from file
add resource mapping file
make sure resources exist
fix plugin merge
fix merge
add more formats
make content-type cononical everywhere
add nice dropdown boxes
merge issue make sure py:if is used
Merge branch 'next' into resource_formats