Merge remote-tracking branch 'origin/develop' into develop
Add update and delete user
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'feat/update_and_delete_user' into develop
And rewrite tests

Conflicts:
	app/views/layouts/_header.html.erb