Index and authorization
Merge branches 'updating-users' and 'master'