misc
profile updates

yep
Merge branch 'elley'
Merge branch 'hugh'

Conflicts:
	webapp/profile.html