Merge branch 'release/0.1'
Merge branch 'release/0.2'
Merge branch 'release/xls'
Merge branch 'release/0.3'
Update api.py

Fix a bug: when the merged result is the same as master, the fields will be a empty list. The empty list is different from `None`.
Merge pull request #41 from hanfeisun/master

Update api.py
Merge branch 'release/0.4'

* release/0.4: (60 commits)
  bump 0.4
  Added compiled messages
  fix xlwt styles for export to except
  fixes README
  update README
  fixes DateTimeField issue
  add tests
  bug fixrs
  fixes django 1.4
  removed snaphots from casper tests
  code clean
  updates travis
  fixes tests
  removes limit for Travis to build only feature/casper
  add `title` to Merge/Graph templates
  fixes test.
  cleanup conftest.py
  udates travis.ynl
  fixex tests
  fixes transaction management for django<1.6
  ...

Conflicts:
	adminactions/api.py
Merge branch 'develop' of https://github.com/DjangoAdminHackers/django-adminactions into develop