updates Makefile
Merge pull request #30 from Madec/develop

More internationalization and Italian localization
fixes #33 - Separate Install from Test requirements
Merge branch 'develop' of github.com:saxix/django-adminactions into develop

* 'develop' of github.com:saxix/django-adminactions:
  More internationalization and Italian localization
  add django to requirements.pip to allow Sphinx to work
  open 0.4
  bump 0.3
  pep8
  removes webtests from packaging

Conflicts:
	CHANGES
	setup.py
update testing requirements in requirements.pip

testing requirements should go in a different file to not collide with the main projects. However replacing == with >= should do the trick! ;-)
Merge pull request #34 from mrc75/patch-1

update testing requirements in requirements.pip
Merge branch 'develop' of github.com:saxix/django-adminactions into develop

* 'develop' of github.com:saxix/django-adminactions:
  update testing requirements in requirements.pip

Conflicts:
	adminactions/requirements/testing.pip
Proper name for "tests_require"
Merge pull request #35 from tdruez/patch-1

ops...
removes double requirements
Merge branch 'develop' of github.com:saxix/django-adminactions into develop

* 'develop' of github.com:saxix/django-adminactions:
  Proper name for "tests_require"
updates requirements
Fix the usage of "Customize Massupdate Form"

I tried "mass_updated_form" but it won't work. When I checked the code, I found that it should be "mass_update_form"
Merge pull request #37 from hanfeisun/patch-1

Fix the usage of "Customize Massupdate Form"
add ability to exclude sample values for
some fields in mass_update ( is TextField)
updates django version in Makefile and travis config
Merge branch 'develop' of github.com:saxix/django-adminactions into develop

* 'develop' of github.com:saxix/django-adminactions:
  Fix the usage of "Customize Massupdate Form"
removes unuse module py_settings
fixes Makefiledb creattion
mysql TEST_COLLATION