Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/its-dirg/pyoidc
Merge branch 'master' of https://github.com/its-dirg/pyoidc
Merge branch 'develop'
Error in handling expires parameter in cookie. Should be seconds since the cookie was received.
Polished documentation for multi auth.
Fixed assertion consumer service index.
Updated endpoint indices for SAML.
Merged OP conf and SP conf for regular OP and studentness OP.
Removed unused config files.
Year in birthdate claim is allowed to be 0000 according to the spec.
Merge branch 'master' of https://github.com/rohe/pyoidc

Conflicts:
	src/oic/oauth2/__init__.py
Unnecessary log line
New method and fixed some old.
If auth_time and/or loa is available return even if not specifically asked for.
Capabilities should always be represented as a class instance.
Minor tweaks.
Merge branch 'master' of https://github.com/rohe/pyoidc
Merge branch 'develop'