highlight selected user and additional category details added
Merge branch 'master' into gh-pages