basically done
Merge branch 'ellen/fix_this_problem'

Conflicts:
	Frankenstein_admin/admin_page/models/performance.js