Fix of counterbalancing bug

count if completed and/or credited
big data.
Merge branch 'dev' into calc_bonus

Conflicts:
	psiturk/models.py