Add devise
Update branch and fix conflicts
A place belongs to a user