current_user replaced by @user
Merge branch 'development'