commit fix
Merge branch 'master' of https://github.com/artscoop/django-inplaceedit

Conflicts:
	MANIFEST.in