Profile.html works...mostly.  Also add query
Merge branch 'master' into GriffsBranch

Conflicts:
	client/profile/profile.html
Merge branch 'GriffsBranch'