FIX: If the progress docked and you jumped to the top it could dissappear.
Merge pull request #1146 from ZogStriP/add-comment-in-database-yml-files

add a comment in database.yml template files indicating that Sidekiq mus...
Merge pull request #1143 from ahx/fix-cas-email-name-and-improve-authentication-specs

Improve the omniauth controller specs. Fix the email provided by CAS. Get name from CAS attributes.
FIX: new users are allowed to upload images to your servers
Merge pull request #1147 from ZogStriP/fix-new-users-are-allowed-to-upload-images-to-your-servers

FIX: new users are allowed to upload images to your servers
our referer is bust if there is no domain
spec for change
cheat to fix duplicate key on thumbnails
user where as opposed to find to compensate for deleted topics
add some error handling
getting weird exceptions after handling one, work around
never double load the stream.
Fix recommendations from #1145
Update the omnibus_updater chef recipe
Merge branch 'master' of github.com:discourse/discourse
Put back mailcatcher config in development.rb
Show the error message when send activation email fails from admin
Use POST for send_activation_email action
Merge pull request #1145 from abbat/yandex-workaround

Workaround solution to help Yandex crawler index discourse.
Extra tests for composer