bump some versions
Merge branch 'master' of github.com:SUNET/eduid-api

Conflicts:
	setup.py