Updated package metadata
Merge branch 'master' of github.com:grisumbras/hapis

Conflicts:
	setup.py