pep8 and some documentation
added tests
allow to swap origin/other in merge action
merge action (still missing signal management)
Fix broken tests until 1.5 is released
Merge pull request #10 from ipmb/patch-1

Fix broken tests until 1.5 is released
merge docs & tests
merge master
added css
merge docs screenshots
docs, beautify and minor refactoring
restored GenericIPAddressField in demomodel
updated readme
updated docs
added argument 'exclude' to add_to_site()
missed docs extension `version.py`
ops ... removed django 1.3.1 added to travis config by mistake
The name for the generated permissions will now never exceed 50 char as it's the limit on the Django Permission model, see bug in Django: https://code.djangoproject.com/ticket/18959
Merge pull request #11 from michelmichel/master

adminactions permissions creation on syncdb can fail
added missed 'form' argumen to some adminaction_end.send calls