Users, Login/logout
Merge branch 'master' of github.com:geser6666/chem-technologiesCRM

Conflicts:
	db/schema.rb