added devise auth
fix database issues
resolve merge conflict
fix login/edit profile error