improved profile screen labeling
Merge remote-tracking branch 'origin/master'

Conflicts:
	profile.php