Populate values for ApplicationContent admin_fields from parameters
Merge remote-tracking branch 'guetux/sge_temp_fix' into maint

* guetux/sge_temp_fix:
  Populate values for ApplicationContent admin_fields from parameters
Merge branch 'maint'

* maint:
  Populate values for ApplicationContent admin_fields from parameters

Conflicts:
	tests/testapp/models.py
Merge branch 'master' into next

* master:
  Populate values for ApplicationContent admin_fields from parameters

Conflicts:
	tests/testapp/tests/test_page.py
Line length