Ensure the PK field is rendered in inline admin forms
Remove @commit_on_success, this should really not be necessary anymore
FeinCMS v1.7.7

The hopefully-compatible-with-Django-1.6-release.
Merge branch 'master' into next

* master:
  FeinCMS v1.7.7
  Remove @commit_on_success, this should really not be necessary anymore
  Ensure the PK field is rendered in inline admin forms

Conflicts:
	feincms/__init__.py
Django 1.6 has been released, run tests with the release version now
Let's see what happens if we add Python3.3 to the travis-ci matrix
Stop registering and reregistering extensions in the testsuite
Add travis CI images to the readme
Try again
Merge branch 'next' of github.com:feincms/feincms into tabbed_options