User profile thing.
Merge branch 'jrouly'

merginy
Merge branch 'master' into irunner