Merge pull request #1646 from stevewithington/candidate

Candidate
userui edits
Merge branch 'candidate' of git://github.com/blueriver/MuraCMS into candidate