Add Person Screen
Merge remote-tracking branch 'mmaron/master'

Conflicts:
	less/main.less