Use sidekiq for sending mails
Merge branch 'develop' into use-sidekiq-for-mails

Conflicts:
	config/email_addresses.yml.example
Apply ruby-style guide
Removed the article observer test

Since we're no longer using .deliver here.
ArticleMailer is tested elsewhere anyway?
change facebook url
Merge branch 'master' into develop
Merge pull request #982 from BiteKollektiv/use-sidekiq-for-mails

Use sidekiq for sending mails
HOTFIX #983 - take article#show available quantity out of cache
Merge branch 'master' into develop
Moved social media buttons from library header to body
Mass uploader now exports transport_time
bugfix
merged and fixed tests