"Merged" categoryModel with master

"Merged" categoryModel with master to include CAS login/logout
implementation.