Preparing release 4.0.2
Merge branch 'develop' of github.com:UPCnet/bigmax into develop

Conflicts:
	CHANGES.rst
	setup.py