Merge remote-tracking branch 'origin/Results' into Results

Conflicts:
	qsystem/accounts/admin.py
	qsystem/investmanager/models.py
	qsystem/results/models.py