Cll merge to master

added devise, removed old user model and associated files