added :authenticate_user!
Merge remote-tracking branch 'origin/master'