Basic User Model with secure password
remove spec cytosite
merge with master