basic implementation of swapping and borrowing
basic implementation of swapping and borrowing
swappable and borrowable are now commendations and can be searched
swappable and borrowable are now commendations and can be searched
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
implement comments for articles
implement comments for articles
Merge branch 'feature-borrow' of github.com:fairnopoly/fairnopoly into feature-borrow
Merge branch 'develop' into feature-borrow

Conflicts:
	app/assets/stylesheets/controller/articles.css.scss
	app/helpers/articles_helper.rb
	app/views/articles/show/_article_contents.html.haml
	db/schema.rb
Properly test mail delivery
Add from field to comment notification mail
Set default for comment notifications to true

This also sets it to true for all users
Use string interpolation for mail view

This avoids NilClass errors
Merge pull request #979 from BiteKollektiv/set-comment-notifications-defaults

Set default for comment notifications to true instead of false
Merge pull request #978 from BiteKollektiv/add-comments-mailer

Possible fix for failing comment notification mails
fix last pull request merges and refactor email defaults
another fix for comment mailer