Correct credential func to refactored class
Merge branch 'master' of github.com:cggh/panoptes

Conflicts:
	servermodule/panoptesserver/subset_create.py