Merge branch 'recovered-cxf'
JJH:  not sure why this didn't commit / merge, but it needs to be in the
master
JJH:  security and login form mods.
JJH:  got roles working.  Need to hash the passwords.
JJH:  spring security and roles are working as expected.
updated header.