users controller and the show html updated
pulled down latest changes
Merge branch 'master' of https://github.com/piratetone/krossover-v2