add users-hotel assosiation, and devise
merge with master