re design model refences
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/evolutions/default/1.sql
staff update