code formatting adjusted
code formatting uncommitted. should be no change here.
Merge branch 'dev' of razorit.beanstalkapp.com:/zuha into dev
Fixed model to controller communication for ZuhaAcl and ThemeableBehavior.

The app model and the themeable behavior now write the necessary data to their own variables instead of using the Model->data variable that already existed.  We found conflicts that forced it.  So, two new variables were added to the top of AppModel.
Fixed the display of user fields, and whether they're checked.

Before this some user fields would not show as checked even though they were set in the db.
Maintain the Contact.id when saving a User that had Contact data passed along with it.
Merge branch 'dev' of razorit.beanstalkapp.com:/zuha into dev
Added a new function and UNIT TEST TO GO WITH IT,

Adding a user from UserGroups functions a little differently, and emails the new user a password, and sets a new field call pwd_change which will eventually force people to change their password.
Had a brainstorm about how to handle the forcing of a password change. Put comments in, and will work on finalizing later.
Force Password Change Setting Enabled

There is a new db field called pwd_change, which if set to 1, will force the user to the edit password page after login, and will not allow any other page while they are logged in.
Forcing a password change should work now.  Entering final testing.
submod update
fake conflict
commented out broken userRole array that was supposed to be saved to Session
Merge branch 'stage' into dev
commented out _forcePwdChange() for now
amended comment
Product Category, and a new method called User::procreate

For use when someone besides the user themselves is creating a user. It create the user, a random password, and emails the user a link that lets them login and claim the account.
Merge branch 'dev' of razorit.beanstalkapp.com:/zuha into dev
Put the password force back, because the user model has no reference to the field users.pwd_change now