conceptscheme_id should always be an integer.
Reworking handling of conceptscheme_id.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	skosprovider_sqlalchemy/providers.py
	tests/test_providers.py