Prevent attribute conflict for show_editable_model tag
Use module_name instead of object_name in show_editable_model tag
Merge pull request #2457 from ychouinard/develop

Prevent attribute conflict for show_editable_model tag
Fix PlaceholderApp urlconf in test_utils
Merge pull request #2460 from yakky/feature/fix_placeholderapp_urlconf

Fix PlaceholderApp urlconf in test_utils