merge master into user to check for conflicts.
Merge branch 'user' of github.com:Agsiegert/wtpho into user
coorected admin /user views