need to add password encryption
Merge branch 'master' of http://github.com/CWSTeam/CWS

I got an error, so I needed to pull