User profile thing.
Merge branch 'jrouly'

merginy