bloody stackprof
person display name (now LNF - last name first)
Merge branch 'development' into bug_fixes

Conflicts:
	Gemfile
Merge branch 'bug_fixes' into development