Merge branch 'develop' into stackpublish
Fix import
Use lowercase Page in Content type
fix link to settings according to new project layout since django 1.4
Merge pull request #2382 from yakky/feature/horrible_typo

Fix import
add language
add missing '
Merge pull request #2383 from asmaps/develop

Introductory tutorial fixes
Add test for #2384
rendered_content and content must be the same in the show_editable_model contenxt.
Add comments
Merge pull request #2386 from yakky/feature/fix_show_edit_model_filters

Fix applying filter to show_edit_model output
nitpick
removed dirty flag from forms and fixed a response
reveres
Merge pull request #2372 from digi604/stackpublish

Stacks publishing fixes #2130
Merge branch 'develop' into placeholder_plugin
fixed merge error
removed unused line
PlaceholderRef should have a language