Softcoded staff aliases

Conflicts:
	common.js