bump version
remove dependency on collective.z3cform.wizard
Merge branch 'develop' into qa

* develop:
  remove dependency on collective.z3cform.wizard
  bump version

Conflicts:
	setup.py